diff --git a/slapos/runner/__init__.py b/slapos/runner/__init__.py
index 3631073d211b3fc83eee8fb8ba55d7004d525cd3..50616a8fc6b2fd865afd615db10bb83483d6ee78 100755
--- a/slapos/runner/__init__.py
+++ b/slapos/runner/__init__.py
@@ -150,9 +150,9 @@ def serve(config):
     os.mkdir(workdir)
   if not os.path.exists(software_link):
     os.mkdir(software_link)
-  cloneDefaultGit(app.config) 
   slapos.runner.process.setHandler()
   config.logger.info('Running slapgrid...')
+  cloneDefaultGit(app.config) 
   runInstanceWithLock(app.config)
   config.logger.info('Done.')
   app.wsgi_app = ProxyFix(app.wsgi_app)
diff --git a/slapos/runner/utils.py b/slapos/runner/utils.py
index ae50c7432cba20ab69e5663f19f7d607999ff883..f3cad6bf69aaa35327b6bddf74a2fc44540c167e 100755
--- a/slapos/runner/utils.py
+++ b/slapos/runner/utils.py
@@ -809,13 +809,9 @@ def cloneDefaultGit(config):
   """Test if the slapos git has been downloaded yet
   If not, download it in read-only mode"""
   slap = os.path.join(config['runner_workdir'], 'project', 'slapos')
-  slap_ro = os.path.join(config['runner_workdir'], 'project', 'slapos-readonly')
-  if not os.path.exists(slap_ro) or not os.path.exists(slap_ro):
+  if not os.path.exists(slap):
     from gittools import cloneRepo
-    user = getSession(config)
-    data = {'path': slap_ro,
+    data = {'path': slap,
             'repo': 'http://git.erp5.org/repos/slapos.git',
-            'email': user[2],
-            'user': user[3],
     }
     cloneRepo(data)