Minor fixes and user password change