changed control for user login
fixed merge