Some minor fixes to user show and edit