diff --git a/Vocaluxe/Website/index.html b/Vocaluxe/Website/index.html
index c18c4deb..fe235fee 100644
--- a/Vocaluxe/Website/index.html
+++ b/Vocaluxe/Website/index.html
@@ -138,7 +138,7 @@
                 <option value="2">Hard</option>
             </select>
 
-            <label for="playerPassword" class="input">New Password:</label>
+            <label id="playerPasswordLabel" for="playerPassword" class="input">New Password:</label>
             <input type="password" id="playerPassword" name="playerPassword" data-mini="true" value="**oldPassword**">
 
             <br />
diff --git a/Vocaluxe/Website/js/main.js b/Vocaluxe/Website/js/main.js
index 5058b2f7..c294c41f 100644
--- a/Vocaluxe/Website/js/main.js
+++ b/Vocaluxe/Website/js/main.js
@@ -145,7 +145,8 @@ function initPageLoadHandler() {
             $('#playerDifficulty').prop('disabled', false);
             $('#playerSaveButton').show().unbind("click");
             $('#playerAvatar').unbind("click");
-            $('#playerPassword').prop('disabled', false).show();
+            $('#playerPassword').prop('disabled', false).parent().show();
+            $('#playerPasswordLabel').show();
 
             $('#playerAvatar').click(function () {
                 if ($('#captureContainer').length > 0) {
@@ -176,7 +177,8 @@ function initPageLoadHandler() {
             $('#playerDifficulty').prop('disabled', true);
             $('#playerSaveButton').hide().unbind("click");
             $('#playerAvatar').unbind("click");
-            $('#playerPassword').prop('disabled', true).hide();
+            $('#playerPassword').prop('disabled', true).parent().hide();
+            $('#playerPasswordLabel').hide();
         }
     }