Index: ChangeAdminPasswordCommand.java
===================================================================
--- ChangeAdminPasswordCommand.java	(revision 55908)
+++ ChangeAdminPasswordCommand.java	(working copy)
@@ -142,6 +142,7 @@
             if (password == null) {
                 throw new CommandValidationException(strings.get("AdminPwRequired"));
             }
+            programOpts.setPassword(password, ProgramOptions.PasswordLocation.USER);
         }
 
         if (newpassword == null) {