diff --git a/protected/humhub/docs/CHANGELOG.md b/protected/humhub/docs/CHANGELOG.md
index 836edcb199..d68467f2ea 100644
--- a/protected/humhub/docs/CHANGELOG.md
+++ b/protected/humhub/docs/CHANGELOG.md
@@ -17,6 +17,7 @@ HumHub Change Log
 - Fix: `ActiveQueryContent:readable()` for guest users missing join
 - Enh: Added `ContentActiveRecord:managePermission` for changing the default write permission of ContentActiveRecord classes
 - Enh: Moved all default `WallEntryControls` to `WallEntry:getContextMenu()` widget.
+- Fix: Connect google OAuth under `Profile Settings  -> Connected Accounts` throws invalid redirect uri.
 
 1.2.0 (April 16, 2017)
 --------------------------------
diff --git a/protected/humhub/docs/guide/admin/authentication.md b/protected/humhub/docs/guide/admin/authentication.md
index dcaae97e96..f153929ab1 100644
--- a/protected/humhub/docs/guide/admin/authentication.md
+++ b/protected/humhub/docs/guide/admin/authentication.md
@@ -57,16 +57,17 @@ return [
 Google
 ------
 
-In order to use Google OAuth you must create a project at <https://console.developers.google.com/project>
+In order to use Google OAuth you must create a **project** at <https://console.developers.google.com/project>
 and setup its credentials at <https://console.developers.google.com/project/[yourProjectId]/apiui/credential>.
 
-In order to enable using scopes for retrieving user attributes, you should also enable Google+ API at
+In order to enable using scopes for retrieving user attributes, you have to enable Google+ API at
 <https://console.developers.google.com/project/[yourProjectId]/apiui/api/plus>.
 
-Authorization callback URLs:
-- http://domain/path-to-humhub/user/auth/external?authclient=google (With clean urls enabled)
-- http://domain/path-to-humhub/index.php?r=user%2Fauth%2Fexternal&authclient=google (Without clean urls)
+Add one of the following **authorization callback URLs** to your  googles **Credentials** configuration:
+- http://<domain>/<path-to-humhub>/user/auth/external?authclient=google (With clean urls enabled)
+- http://<domain>/<path-to-humhub>/index.php?r=user%2Fauth%2Fexternal&authclient=google (Without clean urls)
 
+>Note: Replace **domain** and **path-to-humhub** in the mentioned redirect urls.
 
 Add following block to your configuration (protected/config/common.php):
 
diff --git a/protected/humhub/modules/user/views/account/connected-accounts.php b/protected/humhub/modules/user/views/account/connected-accounts.php
index 4d5db02b8a..e9c14a8a91 100644
--- a/protected/humhub/modules/user/views/account/connected-accounts.php
+++ b/protected/humhub/modules/user/views/account/connected-accounts.php
@@ -28,7 +28,7 @@ use yii\helpers\Url;
                     <?php elseif (in_array($client->getId(), $activeAuthClientIds)) : ?>
                         <?php echo Html::a(Yii::t('UserModule.base', 'Disconnect account'), ['connected-accounts', 'disconnect' => $client->getId()], ['class' => 'btn btn-danger btn-sm', 'data-method' => 'POST']); ?>
                     <?php else: ?>
-                        <?php echo Html::a(Yii::t('UserModule.base', 'Connect account'), Url::to(['/user/auth/external', 'authclient' => $client->getId()]), ['class' => 'btn btn-success  btn-sm']); ?>
+                        <?php echo Html::a(Yii::t('UserModule.base', 'Connect account'), Url::to(['/user/auth/external', 'authclient' => $client->getId()]), ['class' => 'btn btn-success  btn-sm', 'data-pjax-prevent' => ""]); ?>
                     <?php endif; ?>
                 </td>
             </tr>