Fix for user edit view.
Merge branch 'master' into revised_network_bar