Made the change password dialog work with old and new passwords