Added possibility to change password for support user
Fix broken merge