diff --git a/server/ressources/gpass.js b/server/ressources/gpass.js
index acfe4c4..cd48010 100755
--- a/server/ressources/gpass.js
+++ b/server/ressources/gpass.js
@@ -364,6 +364,9 @@ function update_master_key(warning_unciphered)
 
     if (current_mkey != "")
 	current_mkey = derive_mkey(current_user, current_mkey);
+    else
+	// Disable warning on empty master key (clear passwords from others)
+	warning_unciphered = false;
 
     change_master_key(warning_unciphered);
 }