diff --git a/dist/lib/swagger-client.js b/dist/lib/swagger-client.js
index 02a283d9..6ff00aea 100644
--- a/dist/lib/swagger-client.js
+++ b/dist/lib/swagger-client.js
@@ -2822,7 +2822,7 @@ JQueryHttpClient.prototype.execute = function(obj) {
     if(contentType) {
       if(contentType.indexOf("application/json") === 0 || contentType.indexOf("+json") > 0) {
         try {
-          out.obj = response.responseJSON || {};
+          out.obj = response.responseJSON || JSON.parse(out.data) || {};
         } catch (ex) {
           // do not set out.obj
           log("unable to parse JSON content");
diff --git a/dist/lib/swagger-oauth.js b/dist/lib/swagger-oauth.js
index bcbc2745..c4e144fa 100644
--- a/dist/lib/swagger-oauth.js
+++ b/dist/lib/swagger-oauth.js
@@ -4,6 +4,7 @@ var popupDialog;
 var clientId;
 var realm;
 var oauth2KeyName;
+var redirect_uri;
 
 function handleLogin() {
   var scopes = [];
@@ -141,6 +142,8 @@ function handleLogin() {
 
     window.enabledScopes=scopes;
 
+    redirect_uri = redirectUrl;
+
     url += '&redirect_uri=' + encodeURIComponent(redirectUrl);
     url += '&realm=' + encodeURIComponent(realm);
     url += '&client_id=' + encodeURIComponent(clientId);
@@ -199,7 +202,8 @@ function processOAuthCode(data) {
   var params = {
     'client_id': clientId,
     'code': data.code,
-    'grant_type': 'authorization_code'
+    'grant_type': 'authorization_code',
+    'redirect_uri': redirect_uri
   }
   $.ajax(
   {
diff --git a/lib/swagger-client.js b/lib/swagger-client.js
index 02a283d9..6ff00aea 100644
--- a/lib/swagger-client.js
+++ b/lib/swagger-client.js
@@ -2822,7 +2822,7 @@ JQueryHttpClient.prototype.execute = function(obj) {
     if(contentType) {
       if(contentType.indexOf("application/json") === 0 || contentType.indexOf("+json") > 0) {
         try {
-          out.obj = response.responseJSON || {};
+          out.obj = response.responseJSON || JSON.parse(out.data) || {};
         } catch (ex) {
           // do not set out.obj
           log("unable to parse JSON content");