diff --git a/src/cmd/cmd.cpp b/src/cmd/cmd.cpp
index f82d97e444d30..18e0d20f49e71 100644
--- a/src/cmd/cmd.cpp
+++ b/src/cmd/cmd.cpp
@@ -392,17 +392,14 @@ int main(int argc, char **argv)
         if (password.isEmpty()) {
             password = queryPassword(user);
         }
-    }else{
-       //else use ENV?
-      if(user.isEmpty()){
-	user = std::getenv("NC_USER");
-      }
-      if(password.isEmpty()){
-	password = std::getenv("NC_PASSWORD");
-      }
-
+    } else {
+        if (user.isEmpty()) {
+            user = std::getenv("NC_USER");
+        }
+        if (password.isEmpty()) {
+            password = std::getenv("NC_PASSWORD");
+        }
     }
-   
 
     // Find the folder and the original owncloud url