diff --git a/slapos/runner/utils.py b/slapos/runner/utils.py
index dad126fdd9cba6a93727eb4148fd1b69190d65d6..7fa7768f031768eebdb2687ce2fc7f5f4d7ad003 100755
--- a/slapos/runner/utils.py
+++ b/slapos/runner/utils.py
@@ -84,7 +84,8 @@ def saveSession(config, account):
     # Htpasswd file for cloud9
     # XXX Cedric Le N order of account list values suppose to be fixed
     # Remove former file to avoid aoutdated accounts
-    os.remove(htpasswdfile)
+    if os.path.exists(htpasswdfile):
+      os.remove(htpasswdfile)
     passwd = HtpasswdFile(htpasswdfile, create=True)
     passwd.update(account[0], account[1])
     passwd.save()