reformat the output when creating admin user
Merge branch 'staging' into 5.6