diff --git a/public/vroom.pl b/public/vroom.pl
index 3e0072d..4d09a01 100755
--- a/public/vroom.pl
+++ b/public/vroom.pl
@@ -539,7 +539,8 @@ get '/(*room)' => sub {
     return $self->render('error',
       msg => sprintf($self->l("ERROR_ROOM_s_LOCKED"), $room),
       err => 'ERROR_ROOM_s_LOCKED',
-      room => $room
+      room => $room,
+      ownerPass => ($data->{owner_password}) ? '1':'0'
     );
   }
   # Now, if the room is password protected and we're not a participant, nor the owner, lets prompt for the password
diff --git a/templates/default/error.html.ep b/templates/default/error.html.ep
index 1fc587f..ab78f0b 100644
--- a/templates/default/error.html.ep
+++ b/templates/default/error.html.ep
@@ -11,7 +11,7 @@
       <a class="btn btn-default btn-lg" role="button" href="<%= $self->get_url('/') . $room %>"><%=l 'JOIN_THIS_ROOM' %></a>
       <% } elsif ($err eq 'WRONG_PASSWORD'){ %>
       <a class="btn btn-default btn-lg" role="button" href="<%= $self->get_url('/password') . '/' . $room %>"><%=l 'TRY_AGAIN' %></a>
-      <% } elsif ($err eq 'ERROR_ROOM_s_LOCKED'){ %>
+      <% } elsif ($err eq 'ERROR_ROOM_s_LOCKED' && $ownerPass){ %>
       <a class="btn btn-default btn-lg" role="button" href="<%= $self->get_url('/password') . '/' . $room %>"><%=l 'AUTH_IF_OWNER' %></a>
       <% } %>
     </div>