diff --git a/qutebrowser/browser/network/networkmanager.py b/qutebrowser/browser/network/networkmanager.py
index b7a544262..8e74f05c3 100644
--- a/qutebrowser/browser/network/networkmanager.py
+++ b/qutebrowser/browser/network/networkmanager.py
@@ -248,9 +248,8 @@ class NetworkManager(QNetworkAccessManager):
                            mode=usertypes.PromptMode.user_pwd,
                            owner=reply)
         if answer is not None:
-            user, password = answer  # pylint: disable=unpacking-non-sequence
-            authenticator.setUser(user)
-            authenticator.setPassword(password)
+            authenticator.setUser(answer.user)
+            authenticator.setPassword(answer.password)
 
     @pyqtSlot('QNetworkProxy', 'QAuthenticator')
     def on_proxy_authentication_required(self, proxy, authenticator):
@@ -264,10 +263,8 @@ class NetworkManager(QNetworkAccessManager):
             answer = self._ask("Proxy username ({}):".format(
                 authenticator.realm()), mode=usertypes.PromptMode.user_pwd)
             if answer is not None:
-                # pylint: disable=unpacking-non-sequence
-                user, password = answer
-                authenticator.setUser(user)
-                authenticator.setPassword(password)
+                authenticator.setUser(answer.user)
+                authenticator.setPassword(answer.password)
                 _proxy_auth_cache[proxy_id] = answer
 
     @config.change_filter('general', 'private-browsing')
diff --git a/qutebrowser/mainwindow/statusbar/prompter.py b/qutebrowser/mainwindow/statusbar/prompter.py
index fe5907f88..7728cbf46 100644
--- a/qutebrowser/mainwindow/statusbar/prompter.py
+++ b/qutebrowser/mainwindow/statusbar/prompter.py
@@ -33,6 +33,7 @@ from qutebrowser.utils import usertypes, log, qtutils, objreg, utils
 PromptContext = collections.namedtuple('PromptContext',
                                        ['question', 'text', 'input_text',
                                         'echo_mode', 'input_visible'])
+AuthTuple = collections.namedtuple('AuthTuple', ['user', 'password'])
 
 
 class Prompter(QObject):
@@ -237,7 +238,7 @@ class Prompter(QObject):
         elif self._question.mode == usertypes.PromptMode.user_pwd:
             # User just entered a password
             password = prompt.lineedit.text()
-            self._question.answer = (self._question.user, password)
+            self._question.answer = AuthTuple(self._question.user, password)
             modeman.maybe_leave(self._win_id, usertypes.KeyMode.prompt,
                                 'prompt accept')
             self._question.done()