diff --git a/cli-token.html b/cli-token.html
index c510531..3632cdc 100644
--- a/cli-token.html
+++ b/cli-token.html
@@ -25,6 +25,7 @@ <h1>{{appname}} for {{service}}</h1>
       <p>Type in the CLI token</p>
       <form action="/cli-token-login" method="POST">
         <input type="hidden" id="id" name="id" value="{{id}}" />
+        <input type="hidden" id="fetchtoken" name="fetchtoken" value="{{fetchtoken}}" />
         <input type="hidden" id="tokenversion" name="tokenversion" value="{{tokenversion}}" />
         <input class="form-control" type="text" id="token" name="token" required />
         <br/>
diff --git a/main.py b/main.py
index 8e13c1d..32b42e6 100644
--- a/main.py
+++ b/main.py
@@ -169,8 +169,9 @@ def get(self):
                 link = '/cli-token?id=' + n['id']
             else:
                 link = '/login?id=' + n['id']
-                if self.request.get('token', None) is not None:
-                    link += '&token=' + self.request.get('token')
+
+            if self.request.get('token', None) is not None:
+                link += '&token=' + self.request.get('token')
 
             if tokenversion is not None:
                 link += '&tokenversion=' + str(tokenversion)
@@ -401,6 +402,7 @@ def get(self):
             'appname': settings.APP_NAME,
             'longappname': settings.SERVICE_DISPLAYNAME,
             'id': provider['id'],
+            'fetchtoken':  self.request.get('token', ''),
             'tokenversion': self.request.get('tokenversion', '')
         }
 
@@ -419,6 +421,8 @@ def post(self):
             provider, service = find_provider_and_service(id)
             display = provider['display']
 
+            fetchtoken = self.request.POST.get('fetchtoken', None)
+
             tokenversion = None
             try:
                 tokenversion = int(self.request.POST.get('tokenversion'))
@@ -464,7 +468,6 @@ def post(self):
                     raise Exception(error)
 
                 authid = 'v2:' + id + ':' + resp['refresh_token']
-                fetchtoken = dbmodel.create_fetch_token(resp)
                 dbmodel.update_fetch_token(fetchtoken, authid)
 
                 # Report results to the user
@@ -484,8 +487,6 @@ def post(self):
 
             keyid, authid = create_authtoken(id, resp)
 
-            fetchtoken = dbmodel.create_fetch_token(resp)
-
             # If this was part of a polling request, signal completion
             dbmodel.update_fetch_token(fetchtoken, authid)