diff --git a/provider/views.py b/provider/views.py
index a774d4df..72248c50 100644
--- a/provider/views.py
+++ b/provider/views.py
@@ -442,7 +442,7 @@ def error_response(self, error, mimetype='application/json', status=400,
         return HttpResponse(json.dumps(error), mimetype=mimetype,
                 status=status, **kwargs)
 
-    def access_token_response(self, access_token):
+    def access_token_response(self, access_token, refresh_token=None):
         """
         Returns a successful response after creating the access token
         as defined in :rfc:`5.1`.
@@ -451,7 +451,8 @@ def access_token_response(self, access_token):
             json.dumps({
                 'access_token': access_token.token,
                 'expires_in': access_token.get_expire_delta(),
-                'refresh_token': access_token.refresh_token.token,
+                'refresh_token': refresh_token.token if refresh_token else \
+                                 access_token.refresh_token.token,
                 'scope': ' '.join(scope.names(access_token.scope)),
             }), mimetype='application/json'
         )
@@ -465,6 +466,7 @@ def authorization_code(self, request, data, client):
                 client)
         if constants.SINGLE_ACCESS_TOKEN:
             at = self.get_access_token(request, grant.user, grant.scope, client)
+            rt = None
         else:
             at = self.create_access_token(request, grant.user, grant.scope, client)
             rt = self.create_refresh_token(request, grant.user, grant.scope, at,
@@ -472,7 +474,7 @@ def authorization_code(self, request, data, client):
 
         self.invalidate_grant(grant)
 
-        return self.access_token_response(at)
+        return self.access_token_response(at, rt)
 
     def refresh_token(self, request, data, client):
         """
@@ -487,7 +489,7 @@ def refresh_token(self, request, data, client):
                 client)
         rt = self.create_refresh_token(request, at.user, at.scope, at, client)
 
-        return self.access_token_response(at)
+        return self.access_token_response(at, rt)
 
     def password(self, request, data, client):
         """
@@ -500,11 +502,12 @@ def password(self, request, data, client):
 
         if constants.SINGLE_ACCESS_TOKEN:
             at = self.get_access_token(request, user, scope, client)
+            rt = None
         else:
             at = self.create_access_token(request, user, scope, client)
             rt = self.create_refresh_token(request, user, scope, at, client)
 
-        return self.access_token_response(at)
+        return self.access_token_response(at, rt)
 
     def get_handler(self, grant_type):
         """