Admin fixes

Jeremy M Fee requested to merge github/fork/jmfee-usgs/admin-fixes into master Jun 03, 2015