Ticket0173: Fix encrypted_password generation
Merge encrypted password fix master