diff --git a/services/webapp/code/rosetta/core_app/api.py b/services/webapp/code/rosetta/core_app/api.py
index f814e05aac43df47614b057b0b5ea7729b7a7933..2c0e699247f2c8eea16d1630b1f609d4b6ef6054 100644
--- a/services/webapp/code/rosetta/core_app/api.py
+++ b/services/webapp/code/rosetta/core_app/api.py
@@ -410,7 +410,7 @@ class FileManagerAPI(PrivateGETAPI, PrivatePOSTAPI):
         if mode=='get':
             command = 'scp -P {} -o LogLevel=ERROR -i {} -4 -o StrictHostKeyChecking=no {}@{}:{} {}'.format(computing_port, computing_keys.private_key_file, computing_user, computing_host, source, dest)
         elif mode == 'put':
-            command = 'scp -P -o LogLevel=ERROR -i {} -4 -o StrictHostKeyChecking=no {} {}@{}:{}'.format(computing_port, computing_keys.private_key_file, source, computing_user, computing_host, dest)
+            command = 'scp -P {} -o LogLevel=ERROR -i {} -4 -o StrictHostKeyChecking=no {} {}@{}:{}'.format(computing_port, computing_keys.private_key_file, source, computing_user, computing_host, dest)
         else:
             raise ValueError('Unknown mode "{}"'.format(mode))
 
@@ -1235,7 +1235,7 @@ class FileManagerAPI(PrivateGETAPI, PrivatePOSTAPI):
                 # Remove file
                 os.remove('/tmp/{}'.format(file_uuid))
 
-            if storage.access_mode == 'cli':
+            elif storage.access_mode == 'cli':
 
                 try:
                     as_user = storage.conf['as_user']