diff --git a/app/Http/Livewire/Associates/Auth/Register/Individual.php b/app/Http/Livewire/Associates/Auth/Register.php
similarity index 97%
rename from app/Http/Livewire/Associates/Auth/Register/Individual.php
rename to app/Http/Livewire/Associates/Auth/Register.php
index 68a0240..a252a51 100644
--- a/app/Http/Livewire/Associates/Auth/Register/Individual.php
+++ b/app/Http/Livewire/Associates/Auth/Register.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace App\Http\Livewire\Associates\Auth\Register;
+namespace App\Http\Livewire\Associates\Auth;
 
 use App\Providers\RouteServiceProvider;
 use App\Associate;
@@ -13,7 +13,7 @@ use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Str;
 use Livewire\Component;
 
-class Individual extends Component
+class Register extends Component
 {
     /** @var string */
     public $name = '';
@@ -176,6 +176,6 @@ class Individual extends Component
 
     public function render()
     {
-        return view('livewire.associates.auth.register.individual');
+        return view('livewire.associates.auth.register');
     }
 }
diff --git a/resources/views/associates/auth/register.blade.php b/resources/views/associates/auth/register.blade.php
new file mode 100644
index 0000000..a19b97a
--- /dev/null
+++ b/resources/views/associates/auth/register.blade.php
@@ -0,0 +1,8 @@
+@extends('layouts.auth')
+@section('title', __('associate_categories.individual'))
+
+@section('content')
+    <div>
+        @livewire('associates.auth.register')
+    </div>
+@endsection
diff --git a/resources/views/associates/auth/register/individual.blade.php b/resources/views/associates/auth/register/individual.blade.php
deleted file mode 100644
index e70a6f3..0000000
--- a/resources/views/associates/auth/register/individual.blade.php
+++ /dev/null
@@ -1,8 +0,0 @@
-@extends('layouts.auth')
-@section('title', __('user_categories.individual'))
-
-@section('content')
-    <div>
-        @livewire('associates.auth.register.individual')
-    </div>
-@endsection
diff --git a/resources/views/livewire/associates/auth/login.blade.php b/resources/views/livewire/associates/auth/login.blade.php
index 61b9680..9fe774c 100644
--- a/resources/views/livewire/associates/auth/login.blade.php
+++ b/resources/views/livewire/associates/auth/login.blade.php
@@ -4,9 +4,9 @@
             <x-logo class="w-auto h-16 mx-auto text-green-600" />
         </a>
 
-        <h2 class="mt-6 text-3xl font-extrabold text-center text-gray-900 leading-9">
+        <h1 class="mt-6 text-3xl font-extrabold text-center text-gray-900 leading-9">
             {{ __('auth.login') }}
-        </h2>
+        </h1>
         <p class="mt-2 text-sm text-center text-gray-600 leading-5 max-w">
             Ou
             <a href="{{ route('register') }}" class="font-medium text-green-600 hover:text-green-500 lowercase focus:outline-none focus:underline transition ease-in-out duration-150">
diff --git a/resources/views/livewire/associates/auth/register/individual.blade.php b/resources/views/livewire/associates/auth/register.blade.php
similarity index 94%
rename from resources/views/livewire/associates/auth/register/individual.blade.php
rename to resources/views/livewire/associates/auth/register.blade.php
index 45c8e1f..10a3fff 100644
--- a/resources/views/livewire/associates/auth/register/individual.blade.php
+++ b/resources/views/livewire/associates/auth/register.blade.php
@@ -4,9 +4,9 @@
             <x-logo class="w-32 h-auto mx-auto text-green-600" />
         </a>
 
-        <h2 class="mt-6 text-3xl font-extrabold text-center text-gray-900 leading-9">
-            {{ __('user_categories.individual') }}
-        </h2>
+        <h1 class="mt-6 text-3xl font-extrabold text-center text-gray-900 leading-9">
+            {{ __('associate_categories.individual') }}
+        </h1>
 
         <p class="mt-2 text-sm text-center text-gray-600 leading-5 max-w">
             Ou
diff --git a/routes/web.php b/routes/web.php
index 306d665..5271147 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -16,8 +16,7 @@ use Illuminate\Support\Facades\Route;
 
 Route::middleware('guest')->group(function () {
     Route::view('login', 'associates.auth.login')->name('login');
-    Route::redirect('register', 'register/individual')->name('register');
-    Route::view('register/individual', 'associates.auth.register.individual')->name('register.individual');
+    Route::view('register/{form?}', 'associates.auth.register')->name('register');
 });
 
 Route::view('password/reset', 'associates.auth.passwords.email')->name('password.request');
diff --git a/tests/Feature/Associates/Auth/Register/IndividualTest.php b/tests/Feature/Associates/Auth/RegisterTest.php
similarity index 80%
rename from tests/Feature/Associates/Auth/Register/IndividualTest.php
rename to tests/Feature/Associates/Auth/RegisterTest.php
index 48df411..d8c419d 100644
--- a/tests/Feature/Associates/Auth/Register/IndividualTest.php
+++ b/tests/Feature/Associates/Auth/RegisterTest.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature\Auth\Associates\Register;
+namespace Tests\Feature\Auth\Associates;
 
 use App\Providers\RouteServiceProvider;
 use App\Associate;
@@ -12,16 +12,16 @@ use Illuminate\Support\Facades\Mail;
 use Livewire\Livewire;
 use Tests\TestCase;
 
-class IndividualTest extends TestCase
+class RegisterTest extends TestCase
 {
     use RefreshDatabase, WithFaker;
 
     /** @test */
     function registration_page_contains_livewire_component()
     {
-        $this->get(route('register.individual'))
+        $this->get(route('register'))
             ->assertSuccessful()
-            ->assertSeeLivewire('associates.auth.register.individual');
+            ->assertSeeLivewire('associates.auth.register');
     }
 
     /** @test */
@@ -31,7 +31,7 @@ class IndividualTest extends TestCase
 
         $this->be($associate);
 
-        $this->get(route('register.individual'))
+        $this->get(route('register'))
             ->assertRedirect(route('home'));
     }
 
@@ -42,7 +42,7 @@ class IndividualTest extends TestCase
 
         $associate = factory(Associate::class)->make();
 
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('address.city', $associate->address['city'])
             ->set('address.complement', $associate->address['complement'])
             ->set('address.country', $associate->address['country'])
@@ -80,7 +80,7 @@ class IndividualTest extends TestCase
     /** @test */
     function address_city_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('address.city', '')
             ->call('register')
             ->assertHasErrors(['address.city' => 'required']);
@@ -89,7 +89,7 @@ class IndividualTest extends TestCase
     /** @test */
     function address_complement_is_not_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('address.complement', '')
             ->call('register')
             ->assertHasNoErrors('address.complement');
@@ -98,7 +98,7 @@ class IndividualTest extends TestCase
     /** @test */
     function address_country_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('address.country', '')
             ->call('register')
             ->assertHasErrors(['address.country' => 'required']);
@@ -107,7 +107,7 @@ class IndividualTest extends TestCase
     /** @test */
     function address_neighbourhood_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('address.neighbourhood', '')
             ->call('register')
             ->assertHasErrors(['address.neighbourhood' => 'required']);
@@ -116,7 +116,7 @@ class IndividualTest extends TestCase
     /** @test */
     function address_postcode_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('address.postcode', '')
             ->call('register')
             ->assertHasErrors(['address.postcode' => 'required']);
@@ -125,7 +125,7 @@ class IndividualTest extends TestCase
     /** @test */
     function address_state_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('address.state', '')
             ->call('register')
             ->assertHasErrors(['address.state' => 'required']);
@@ -134,7 +134,7 @@ class IndividualTest extends TestCase
     /** @test */
     function address_street_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('address.street', '')
             ->call('register')
             ->assertHasErrors(['address.street' => 'required']);
@@ -143,7 +143,7 @@ class IndividualTest extends TestCase
     /** @test */
     function address_number_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('address.number', '')
             ->call('register')
             ->assertHasErrors(['address.number' => 'required']);
@@ -152,7 +152,7 @@ class IndividualTest extends TestCase
     /** @test */
     function birthday_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('birthday', '')
             ->call('register')
             ->assertHasErrors(['birthday' => 'required']);
@@ -161,7 +161,7 @@ class IndividualTest extends TestCase
     /** @test */
     function birthday_is_valid_birthday()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('birthday', '123123')
             ->call('register')
             ->assertHasErrors(['birthday' => 'date_format']);
@@ -170,7 +170,7 @@ class IndividualTest extends TestCase
     /** @test */
     function contribution_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('contribution', '')
             ->call('register')
             ->assertHasErrors(['contribution' => 'required']);
@@ -179,7 +179,7 @@ class IndividualTest extends TestCase
     /** @test */
     function contribution_is_valid_contribution()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('contribution', 'asdasdf')
             ->call('register')
             ->assertHasErrors(['contribution' => 'numeric']);
@@ -188,7 +188,7 @@ class IndividualTest extends TestCase
     /** @test */
     function discussion_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('discussion', '')
             ->call('register')
             ->assertHasErrors(['discussion' => 'required']);
@@ -197,7 +197,7 @@ class IndividualTest extends TestCase
     /** @test */
     function discussion_is_valid_discussion()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('discussion', 'asdasdf')
             ->call('register')
             ->assertHasErrors(['discussion' => 'in']);
@@ -206,7 +206,7 @@ class IndividualTest extends TestCase
     /** @test */
     function document_type_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('document.type', '')
             ->call('register')
             ->assertHasErrors(['document.type' => 'required']);
@@ -215,7 +215,7 @@ class IndividualTest extends TestCase
     /** @test */
     function document_number_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('document.number', '')
             ->call('register')
             ->assertHasErrors(['document.number' => 'required']);
@@ -224,7 +224,7 @@ class IndividualTest extends TestCase
     /** @test */
     function email_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('email', '')
             ->call('register')
             ->assertHasErrors(['email' => 'required']);
@@ -233,7 +233,7 @@ class IndividualTest extends TestCase
     /** @test */
     function email_is_valid_email()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('email', 'tallstack')
             ->call('register')
             ->assertHasErrors(['email' => 'email']);
@@ -244,7 +244,7 @@ class IndividualTest extends TestCase
     {
         factory(Associate::class)->create(['email' => 'tallstack@example.com']);
 
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('email', 'tallstack@example.com')
             ->call('register')
             ->assertHasErrors(['email' => 'unique']);
@@ -255,7 +255,7 @@ class IndividualTest extends TestCase
     {
         factory(Associate::class)->create(['email' => 'tallstack@example.com']);
 
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('email', 'smallstack@gmail.com')
             ->assertHasNoErrors()
             ->set('email', 'tallstack@example.com')
@@ -266,7 +266,7 @@ class IndividualTest extends TestCase
     /** @test */
     function name_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('name', '')
             ->call('register')
             ->assertHasErrors(['name' => 'required']);
@@ -275,7 +275,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_bike_activities_is_not_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.bike_activities', '')
             ->call('register')
             ->assertHasNoErrors('profile.bike_activities');
@@ -284,7 +284,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_bike_use_is_not_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.bike_use', '')
             ->call('register')
             ->assertHasNoErrors('profile.bike_use');
@@ -293,7 +293,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_comments_is_not_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.comments', '')
             ->call('register')
             ->assertHasNoErrors('profile.comments');
@@ -302,7 +302,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_expectations_is_not_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.expectations', '')
             ->call('register')
             ->assertHasNoErrors('profile.expectations');
@@ -311,7 +311,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_gender_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.gender', '')
             ->call('register')
             ->assertHasErrors(['profile.gender' => 'required']);
@@ -320,7 +320,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_gender_is_valid_gender()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.gender', 'asdasdf')
             ->call('register')
             ->assertHasErrors(['profile.gender' => 'in']);
@@ -329,7 +329,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_occupation_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.occupation', '')
             ->call('register')
             ->assertHasErrors(['profile.occupation' => 'required']);
@@ -338,7 +338,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_org_participation_is_not_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.org_participation', '')
             ->call('register')
             ->assertHasNoErrors('profile.org_participation');
@@ -347,7 +347,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_phone_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.phone', '')
             ->call('register')
             ->assertHasErrors(['profile.phone' => 'required']);
@@ -356,7 +356,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_scholarity_is_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.scholarity', '')
             ->call('register')
             ->assertHasErrors(['profile.scholarity' => 'required']);
@@ -365,7 +365,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_scholarity_is_valid_scholarity()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.scholarity', 'asdasdf')
             ->call('register')
             ->assertHasErrors(['profile.scholarity' => 'in']);
@@ -374,7 +374,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_secondary_emails_is_not_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.secondary_emails', '')
             ->call('register')
             ->assertHasNoErrors('profile.secondary_emails');
@@ -383,7 +383,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_social_is_not_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.social', '')
             ->call('register')
             ->assertHasNoErrors('profile.social');
@@ -392,7 +392,7 @@ class IndividualTest extends TestCase
     /** @test */
     function profile_website_is_not_required()
     {
-        Livewire::test('associates.auth.register.individual')
+        Livewire::test('associates.auth.register')
             ->set('profile.website', '')
             ->call('register')
             ->assertHasNoErrors('profile.website');