Making a followup commit for: Changing login password deletes secret
answer - TRUNK-3877