a couple minor fixes for user account view 2
fixing merge conflict with Dr. Hovemeyer