diff --git a/src/freedombone-app-mediagoblin b/src/freedombone-app-mediagoblin
index 988f89f1..a7681f44 100755
--- a/src/freedombone-app-mediagoblin
+++ b/src/freedombone-app-mediagoblin
@@ -348,10 +348,6 @@ function install_mediagoblin {
     echo '    }' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
     echo '}' >> /etc/nginx/sites-available/$MEDIAGOBLIN_DOMAIN_NAME
 
-    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 $MY_USERNAME" - mediagoblin
-
     echo '[Unit]' > /etc/systemd/system/mediagoblin.service
     echo 'Description=Media service' >> /etc/systemd/system/mediagoblin.service
     echo 'Requires=network.target' >> /etc/systemd/system/mediagoblin.service
@@ -373,6 +369,10 @@ function install_mediagoblin {
     systemctl daemon-reload
     systemctl start 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 $MY_USERNAME" - mediagoblin
+
     function_check create_site_certificate
     create_site_certificate $MEDIAGOBLIN_DOMAIN_NAME