minor tweaks to user controller and form