updated user & application controllers