diff --git a/pym/cl_client.py b/pym/cl_client.py
index d8d3dac..11e0f9e 100644
--- a/pym/cl_client.py
+++ b/pym/cl_client.py
@@ -2067,8 +2067,8 @@ you need to remove it from the previous domain"))
         previousHome = "/var/calculate/client-home"
         if isMount(previousHome):
             return True
-        flagMovedUsers = False
         if os.path.exists(previousHome):
+            flagMovedUsers = False
             for userName,x,uid,gid,gecos,directory,shell in loginUsersData:
                 homeDir = directory
                 pathUserList = filter(lambda x: x, directory.split('/'))
@@ -2083,8 +2083,8 @@ you need to remove it from the previous domain"))
                                       %{"src":srcDir,"dest":homeDir})
                     if not self.copyTemplateDir(srcDir, destDir):
                         return False
-	if flagMovedUsers and not os.listdir(previousHome):
-            os.rmdir(previousHome)
+	    if flagMovedUsers and not os.listdir(previousHome):
+                os.rmdir(previousHome)
         return True
 
     def mountRemote(self):