added new to user controller
merged changes to user controller