Password Encryption Issues [#410 responsible:none state:fixed]

Added fix for password encryption issue