User login fix

Change-Id: I321380202a423b6fffd2161e7dc603c419c28c71