Some changes in user controller