fix for user login
Merge branch 'master' of https://github.com/amirbbd89/frnmz