diff --git a/public/js/vroom.js b/public/js/vroom.js
index f5eba44..35d666d 100644
--- a/public/js/vroom.js
+++ b/public/js/vroom.js
@@ -327,12 +327,20 @@ $('#configureRoomForm').submit(function(e){
       $('#joinPassConfirm').notify(localize('PASSWORDS_DO_NOT_MATCH'), 'error');
       return false;
     }
+    if ($('#joinPassFields').css('display') !== 'none' && $('#joinPass').val() === ''){
+      $('#joinPass').notify(localize('PASSWORDS_CANNOT_BE_EMPTY'), 'error');
+      return false;
+    }
   }
   if ($('#ownerPassSet').bootstrapSwitch('state')){
     if ($('#ownerPass').val() !== $('#ownerPassConfirm').val()){
       $('#ownerPassConfirm').notify(localize('PASSWORDS_DO_NOT_MATCH'), 'error');
       return false;
     }
+    if ($('#ownerPassFields').css('display') !== 'none' && $('#ownerPass').val() === ''){
+      $('#ownerPass').notify(localize('PASSWORDS_CANNOT_BE_EMPTY'), 'error');
+      return false;
+    }
   }
   var validEmail = true;
   $('.email-list').find('input').each(function(index, input){