diff --git a/python/vyos/remote.py b/python/vyos/remote.py
index f8a21f0..a69537e 100644
--- a/python/vyos/remote.py
+++ b/python/vyos/remote.py
@@ -140,10 +140,18 @@ def get_remote_config(remote_file):
                 print('HTTP error: {0} {1}'.format(*val))
                 sys.exit(1)

-    if request['user'] and not request['passwd']:
-        curl_cmd = 'curl -# -u {0} {1}'.format(request['user'], remote_file)
+    if request['protocol'] in ('scp', 'sftp'):
+        if request['user'] and not request['passwd']:
+            # not sure what happens if a username/password has ":"
+            curl_cmd = 'curl -# -u {0}:{1} {2}'.format(request['user'], request['passwd'], remote_file)
+        else:
+            curl_cmd = 'curl {0} -# {1}'.format(redirect_opt, remote_file)
+    # XXX: This probably only works for http/https ?
     else:
-        curl_cmd = 'curl {0} -# {1}'.format(redirect_opt, remote_file)
+        if request['user'] and not request['passwd']:
+            curl_cmd = 'curl -# -u {0} {1}'.format(request['user'], remote_file)
+        else:
+            curl_cmd = 'curl {0} -# {1}'.format(redirect_opt, remote_file)

     try:
         config_file = subprocess.check_output(curl_cmd, shell=True,
`