diff --git a/resources/views/settings/google.blade.php b/resources/views/settings/google.blade.php
index ccd5a1078..aaae6aa61 100644
--- a/resources/views/settings/google.blade.php
+++ b/resources/views/settings/google.blade.php
@@ -37,13 +37,13 @@
 
                         <!-- Google login -->
                         <div class="form-group {{ $errors->has('google') ? 'error' : '' }}">
-                            <div class="col-md-3">
+                            <div class="col-md-3 text-right">
                                 {{ Form::label('google_login', 'Google Login') }}
                             </div>
                             <div class="col-md-8">
-                                <label class="form-control">
+                                <label class="form-control{{ (config('app.lock_passwords')===true) ? ' form-control--disabled': '' }}">
                                     <span class="sr-only">{{ trans('admin/settings/general.pwd_secure_uncommon') }}</span>
-                                    {{ Form::checkbox('google_login', '1', old('google_login', $setting->google_login),array( 'aria-label'=>'google_login')) }}
+                                    {{ Form::checkbox('google_login', '1', old('google_login', $setting->google_login),array('aria-label'=>'google_login', (config('app.lock_passwords')===true) ? 'disabled': '')) }}
                                     Enable google login
                                 </label>
                             </div>
@@ -52,11 +52,11 @@
 
                         <!-- Google Client ID -->
                         <div class="form-group {{ $errors->has('google_client_id') ? 'error' : '' }}">
-                            <div class="col-md-3">
+                            <div class="col-md-3 text-right">
                                 {{ Form::label('google_client_id', 'Client ID') }}
                             </div>
-                            <div class="col-md-9">
-                                {{ Form::text('google_client_id', Request::old('google_client_id', $setting->google_client_id), ['class' => 'form-control','placeholder' => trans('general.example') .'000000000000-XXXXXXXXXXX.apps.googleusercontent.com', $setting->demoMode]) }}
+                            <div class="col-md-8">
+                                {{ Form::text('google_client_id', old('google_client_id', $setting->google_client_id), ['class' => 'form-control','placeholder' => trans('general.example') .'000000000000-XXXXXXXXXXX.apps.googleusercontent.com', (config('app.lock_passwords')===true) ? 'disabled': '']) }}
                                 {!! $errors->first('google_client_id', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 @if (config('app.lock_passwords')===true)
                                     <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
@@ -66,11 +66,11 @@
 
                         <!-- Google Client Secret -->
                         <div class="form-group {{ $errors->has('google_client_secret') ? 'error' : '' }}">
-                            <div class="col-md-3">
+                            <div class="col-md-3 text-right">
                                 {{ Form::label('google_client_secret', 'Client Secret') }}
                             </div>
-                            <div class="col-md-9">
-                                {{ Form::text('google_client_secret', Request::old('google_client_secret', $setting->google_client_secret), ['class' => 'form-control','placeholder' => trans('general.example') .'XXXXXXXXXXXX', $setting->demoMode]) }}
+                            <div class="col-md-8">
+                                {{ Form::text('google_client_secret', old('google_client_secret', $setting->google_client_secret), ['class' => 'form-control','placeholder' => trans('general.example') .'XXXXXXXXXXXX', (config('app.lock_passwords')===true) ? 'disabled': '']) }}
                                 {!! $errors->first('google_client_secret', '<span class="alert-msg" aria-hidden="true">:message</span>') !!}
                                 @if (config('app.lock_passwords')===true)
                                     <p class="text-warning"><i class="fas fa-lock" aria-hidden="true"></i> {{ trans('general.feature_disabled') }}</p>
@@ -78,6 +78,17 @@
                             </div>
                         </div>
 
+                        <!-- Google Client Secret -->
+                        <div class="form-group">
+                            <div class="col-md-3 text-right">
+                                <strong>Redirect URL</strong>
+                            </div>
+                            <div class="col-md-8">
+                                <p class="form-control-static">{{ config('app.url') }}/google/callback</p>
+                                <p class="help-block">This should be entered as your calback URL in your Google OAuth app settings in your Google admin console.</p>
+                            </div>
+                        </div>
+
                     </div>
 
 
@@ -87,7 +98,7 @@
                         <a class="btn btn-link text-left" href="{{ route('settings.index') }}">{{ trans('button.cancel') }}</a>
                     </div>
                     <div class="text-right col-md-6">
-                        <button type="submit" class="btn btn-success"><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
+                        <button type="submit" class="btn btn-success"{{ (config('app.lock_passwords')===true) ? ' disabled': '' }}><i class="fas fa-check icon-white" aria-hidden="true"></i> {{ trans('general.save') }}</button>
                     </div>
 
                 </div>