diff --git a/lib/ansible/plugins/connections/__init__.py b/lib/ansible/plugins/connections/__init__.py
index 8e4841225c6..6515f62dcc4 100644
--- a/lib/ansible/plugins/connections/__init__.py
+++ b/lib/ansible/plugins/connections/__init__.py
@@ -130,7 +130,9 @@ class ConnectionBase(with_metaclass(ABCMeta, object)):
         return self.success_key in output
 
     def check_password_prompt(self, output):
-        if isinstance(self.prompt, basestring):
+        if self.prompt in None:
+            return True
+        elif isinstance(self.prompt, basestring):
             return output.endswith(self.prompt)
         else:
             return self.prompt(output)