diff --git a/ligo/lvalert/__init__.py b/ligo/lvalert/__init__.py
index f7501a4d82e5b52a11c3e2d52757af1f9e82c9b5..4ae4b5a35a1a59d2b2f383be6b917034a489df92 100755
--- a/ligo/lvalert/__init__.py
+++ b/ligo/lvalert/__init__.py
@@ -67,12 +67,14 @@ def _get_default_login(netrcfile, server):
 
 
 def _get_login(username, password, netrc, interactive, server):
+    # Return right away if username and password are both provided
+    if username is not None and password is not None:
+        return username, password
+
     default_username, default_password = _get_default_login(netrc, server)
     prompt = 'password for {}@{}: '.format(username, server)
 
-    if username is not None and password is not None:
-        return username, password
-    elif username is None and default_username is None:
+    if username is None and default_username is None:
         raise RuntimeError('Username not specified')
     elif username is None or username == default_username:
         return default_username, default_password