Latest fixes to User controller