diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 2e06bb8..df8e9a6 100644
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -22,7 +22,7 @@
             <div class="row">
                 {{ Form::model($user, ['route' => ['users.update', $user->id], 'method' =>'patch', 'autocomplete' => 'off']) }}
                 <div class="col-md-6">
-                    @includeWhen(request('tab') == null, 'users.partials.edit_profile')
+                    @includeWhen(request('tab') == null || !in_array(request('tab'), ['death', 'contact_address', 'login_account',]), 'users.partials.edit_profile')
                     @includeWhen(request('tab') == 'death', 'users.partials.edit_death')
                     @includeWhen(request('tab') == 'contact_address', 'users.partials.edit_contact_address')
                     @includeWhen(request('tab') == 'login_account', 'users.partials.edit_login_account')
@@ -33,7 +33,7 @@
                 </div>
                 {{ Form::close() }}
                 <div class="col-md-6">
-                    @includeWhen(request('tab') == null, 'users.partials.update_photo')
+                    @includeWhen(request('tab') == null || !in_array(request('tab'), ['death', 'contact_address', 'login_account',]), 'users.partials.update_photo')
                 </div>
             </div>
         </div>
diff --git a/tests/Feature/UsersProfileTest.php b/tests/Feature/UsersProfileTest.php
index 5b17f84..420c427 100644
--- a/tests/Feature/UsersProfileTest.php
+++ b/tests/Feature/UsersProfileTest.php
@@ -35,6 +35,16 @@ class UsersProfileTest extends TestCase
     }
 
     /** @test */
+    public function user_will_see_edit_profile_if_an_invalid_tab_selected()
+    {
+        $user = $this->loginAsUser();
+        $this->visit(route('users.edit', [$user->id, 'tab' => 'invalid_tab']));
+        $this->seePageIs(route('users.edit', [$user->id, 'tab' => 'invalid_tab']));
+        $this->seeElement('input', ['name' => 'nickname']);
+        $this->seeElement('input', ['name' => 'name']);
+    }
+
+    /** @test */
     public function user_can_edit_profile()
     {
         $user = $this->loginAsUser();