diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin
index e9e334b3..988f89f1 100755
--- a/src/freedombone-app-mediagoblin
+++ b/src/freedombone-app-mediagoblin
@@ -350,7 +350,7 @@ function install_mediagoblin {
 
     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && bin/gmg dbupdate" - mediagoblin
     su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && bin/gmg adduser --username $MY_USERNAME --password admin $MEDIAGOBLIN_ADMIN_PASSWORD" - mediagoblin
-    su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && bin/gmg makeadmin admin" - mediagoblin
+    su -c "cd $MEDIAGOBLIN_BASE_DIR/mediagoblin/ && bin/gmg makeadmin $MY_USERNAME" - mediagoblin
 
     echo '[Unit]' > /etc/systemd/system/mediagoblin.service
     echo 'Description=Media service' >> /etc/systemd/system/mediagoblin.service