Fix reference to admin_user and admin_pass
Merge branch 'actionHash' into importLocation