diff --git a/public/vroom.pl b/public/vroom.pl
index e250e0c..e6a02e3 100755
--- a/public/vroom.pl
+++ b/public/vroom.pl
@@ -404,13 +404,13 @@ get '/(*room)' => sub {
       );
     }
   }
-  if ($data->{join_password} && (!$self->session($room) || $self->session($room)->{role} ne 'participant')){
+  if ($data->{join_password} && (!$self->session($room) || $self->session($room)->{role} !~ m/^participant|owner$/)){
     my $url = $self->url_for('/');
     $url .= ($url =~ m/\/$/) ? '' : '/';
     return $self->redirect_to($url . 'password/' . $room);
   }
   # Set this peer as a simple participant if he has no role yet
-  $self->session($room => {role => 'participant'}) if (!$self->session($room) || !self->session($room)->{role});
+  $self->session($room => {role => 'participant'}) if (!$self->session($room) || !$self->session($room)->{role});
   $self->cookie(vroomsession => encode_base64($self->session('name') . ':' . $data->{name} . ':' . $data->{token}, ''), {expires => time + 60});
   # Add this user to the participants table
   unless($self->add_participant($room,$self->session('name'))){