diff --git a/app/Http/Controllers/AccountController.php b/app/Http/Controllers/AccountController.php
index f1b3041de441..090a51e26bdc 100644
--- a/app/Http/Controllers/AccountController.php
+++ b/app/Http/Controllers/AccountController.php
@@ -392,6 +392,10 @@ class AccountController extends BaseController
      */
     public function showUserDetails()
     {
+        if (! auth()->user()->registered) {
+            return redirect('/')->withError(trans('texts.sign_up_to_save'));
+        }
+
         $oauthLoginUrls = [];
         foreach (AuthService::$providers as $provider) {
             $oauthLoginUrls[] = ['label' => $provider, 'url' => URL::to('/auth/'.strtolower($provider))];
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index 1252a0e46287..811d734eb504 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -209,7 +209,7 @@ class LoginController extends Controller
      */
     public function getLogoutWrapper(Request $request)
     {
-        if (auth()->check() && ! auth()->user()->registered) {
+        if (auth()->check() && ! auth()->user()->email && ! auth()->user()->registered) {
             if (request()->force_logout) {
                 $account = auth()->user()->account;
                 app('App\Ninja\Repositories\AccountRepository')->unlinkAccount($account);
diff --git a/resources/views/accounts/details.blade.php b/resources/views/accounts/details.blade.php
index 44caa554b966..b8ec12bb982a 100644
--- a/resources/views/accounts/details.blade.php
+++ b/resources/views/accounts/details.blade.php
@@ -36,7 +36,9 @@
                 {!! Former::text('id_number') !!}
                 {!! Former::text('vat_number') !!}
                 {!! Former::text('website') !!}
-                {!! Former::text('work_email') !!}
+				@if (auth()->user()->registered)
+                	{!! Former::text('work_email') !!}
+				@endif
                 {!! Former::text('work_phone') !!}
                 {!! Former::file('logo')->max(2, 'MB')->accept('image')->inlineHelp(trans('texts.logo_help')) !!}
 
diff --git a/resources/views/accounts/nav.blade.php b/resources/views/accounts/nav.blade.php
index cfcdf26e0bee..a5cbd3df0ec4 100644
--- a/resources/views/accounts/nav.blade.php
+++ b/resources/views/accounts/nav.blade.php
@@ -38,8 +38,10 @@
                 </div>
                 <div class="list-group">
                     @foreach ($settings as $section)
-                        <a href="{{ URL::to("settings/{$section}") }}" class="list-group-item {{ $selected === $section ? 'selected' : '' }}"
-                            style="width:100%;text-align:left">{{ trans("texts.{$section}") }}</a>
+                        @if ($section != ACCOUNT_USER_DETAILS || auth()->user()->registered)
+                            <a href="{{ URL::to("settings/{$section}") }}" class="list-group-item {{ $selected === $section ? 'selected' : '' }}"
+                                style="width:100%;text-align:left">{{ trans("texts.{$section}") }}</a>
+                        @endif
                     @endforeach
                     @if ($type === ADVANCED_SETTINGS && !Utils::isNinjaProd())
                         <a href="{{ URL::to("settings/system_settings") }}" class="list-group-item {{ $selected === 'system_settings' ? 'selected' : '' }}"