diff --git a/.env.example b/.env.example
index aea47f943..8e191e89a 100644
--- a/.env.example
+++ b/.env.example
@@ -62,6 +62,10 @@ DISCORD_TOKEN=null
 DISCORD_SERVER_ID=null
 DISCORD_INVITE_URL="https://discordapp.com/invite/EUhwdrq"
 
+DISCORD_CLIENT_ID=null
+DISCORD_CLIENT_SECRET=null
+DISCORD_REDIRECT_URI="/login/discord/callback"
+
 SENTRY_LARAVEL_DSN=null
 SENTRY_TRACES_SAMPLE_RATE=null
 
@@ -76,4 +80,8 @@ LOGIN_AUTH_BLOG_POST=null
 
 SCRIBE_AUTH_KEY=null
 
-MAIL_TO_ADDRESS="${SUPER_ADMIN_EMAIL}"
\ No newline at end of file
+MAIL_TO_ADDRESS="${SUPER_ADMIN_EMAIL}"
+
+TWITTER_CLIENT_ID=null
+TWITTER_CLIENT_SECRET=null
+TWITTER_REDIRECT_URI="/login/twitter/callback"
\ No newline at end of file
diff --git a/app/Achievements/User/AssociatedTwitter.php b/app/Achievements/User/AssociatedTwitter.php
new file mode 100644
index 000000000..a0f2c2cc2
--- /dev/null
+++ b/app/Achievements/User/AssociatedTwitter.php
@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+namespace App\Achievements\User;
+
+use Assada\Achievements\Achievement;
+
+/**
+ * Class Registered
+ *
+ * @package App\Achievements\User
+ */
+class AssociatedTwitter extends Achievement
+{
+    /*
+     * The achievement name
+     */
+    public $name = 'AssociatedTwitter';
+
+    /*
+     * A small description for the achievement
+     */
+    public $description = 'User associated their account with a Twitter.';
+
+    /*
+     * The amount of "points" this user need to obtain in order to complete this achievement
+     */
+    public $points = 1;
+}
diff --git a/app/Http/Controllers/Auth/DiscordController.php b/app/Http/Controllers/Auth/DiscordController.php
index ac98e7cf5..80ecb2d24 100644
--- a/app/Http/Controllers/Auth/DiscordController.php
+++ b/app/Http/Controllers/Auth/DiscordController.php
@@ -2,11 +2,9 @@
 
 namespace App\Http\Controllers\Auth;
 
-use App\Models\User;
 use App\Models\DiscordAccount;
 use App\Http\Controllers\Controller;
 use Illuminate\Support\Facades\Auth;
-use App\Actions\Fortify\CreateNewUser;
 use Laravel\Socialite\Facades\Socialite;
 use GuzzleHttp\Exception\ClientException;
 use App\Achievements\User\AssociatedDiscord;
diff --git a/app/Http/Controllers/Auth/TwitterController.php b/app/Http/Controllers/Auth/TwitterController.php
new file mode 100644
index 000000000..4dec10a0a
--- /dev/null
+++ b/app/Http/Controllers/Auth/TwitterController.php
@@ -0,0 +1,81 @@
+<?php
+
+namespace App\Http\Controllers\Auth;
+
+use App\Models\TwitterAccount;
+use App\Http\Controllers\Controller;
+use Illuminate\Support\Facades\Auth;
+use Laravel\Socialite\Facades\Socialite;
+use GuzzleHttp\Exception\ClientException;
+use App\Achievements\User\AssociatedTwitter;
+use Laravel\Socialite\Two\InvalidStateException;
+
+class TwitterController extends Controller
+{
+    /**
+     * Redirect the user to the Twitter authentication page.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function redirectToProvider()
+    {
+        return Socialite::driver('twitter')->redirect();
+    }
+
+    /**
+     * Obtain the user information from Twitter.
+     *
+     * @return \Illuminate\Http\Response
+     */
+    public function handleProviderCallback()
+    {
+        try {
+
+            $twitterUser = Socialite::driver('twitter')->user();
+            
+            if ($twitterUser->user['suspended']) {
+                return redirect()->route('login')->withError('Twitter user is suspended.');
+            }
+
+            $userProfile = [
+                'id' => $twitterUser->id,
+                'username' => $twitterUser->nickname,
+                'name' => $twitterUser->name,
+                'email' => $twitterUser->email,
+                'avatar' => $twitterUser->avatar,
+            ];
+
+            // Check if user exists with email
+            $twitterAccount = TwitterAccount::where('id', $twitterUser->id)->first();
+            if (!$twitterAccount && auth()->guest()) {
+                return redirect()->route('login')->withError('Twitter account association not found with any P3D account.');
+            }
+
+            $user = $twitterAccount ? $twitterAccount->user : null;
+            if ($user) {
+                Auth::login($user);
+                return redirect()->route('dashboard');
+            }
+
+            if (auth()->guest() && !$user) {
+                return redirect()->route('login')->withError('You are not logged in and user was not found.');
+            }
+
+            // Create new twitter account
+            $user = auth()->user();
+            $userProfile['user_id'] = $user->id;
+            $userProfile['verified_at'] = now();
+            TwitterAccount::create($userProfile);
+            $user->unlock(new AssociatedTwitter());
+            return redirect()->route('profile.show');
+
+        } catch (InvalidStateException $e) {
+            return redirect()->route('home')->withError('Something went wrong with Twitter login. Please try again.');
+        } catch (ClientException $e) {
+            return redirect()->route('home')->withError('Something went wrong with Twitter login. Please try again.');
+        }
+
+
+        return redirect()->route('dashboard');
+    }
+}
diff --git a/app/Http/Livewire/Profile/TwitterAccount.php b/app/Http/Livewire/Profile/TwitterAccount.php
new file mode 100644
index 000000000..caad1b433
--- /dev/null
+++ b/app/Http/Livewire/Profile/TwitterAccount.php
@@ -0,0 +1,53 @@
+<?php
+
+namespace App\Http\Livewire\Profile;
+
+use Livewire\Component;
+use Illuminate\Support\Facades\Auth;
+
+class TwitterAccount extends Component
+{
+    public $username;
+    public $name;
+    public $avatar;
+
+    public function mount() {
+        $user = Auth::user();
+        $this->username = ($user->twitter ? $user->twitter->username : null);
+        $this->name = ($user->twitter ? $user->twitter->name : null);
+        $this->avatar = ($user->twitter ? $user->twitter->avatar : null);
+        $this->updated_at =  ($user->twitter ? $user->twitter->updated_at->diffForHumans() : null);
+        $this->verified_at =  ($user->twitter ? $user->twitter->verified_at->diffForHumans() : null);
+    }
+
+    /**
+     * Update the user's GameJolt Account credentials.
+     *
+     * @return void
+     */
+    public function remove()
+    {
+        $this->resetErrorBag();
+        $this->resetValidation();
+
+        $user = Auth::user();
+
+        if ($user->twitter) {
+            $user->twitter->delete();
+            $this->username = null;
+            $this->name = null;
+            $this->avatar = null;
+            $this->updated_at = null;
+            $this->verified_at = null;
+        }
+        
+        $this->emit('refresh');
+        
+        return;
+    }
+    
+    public function render()
+    {
+        return view('livewire.profile.twitter-account');
+    }
+}
diff --git a/app/Models/TwitterAccount.php b/app/Models/TwitterAccount.php
new file mode 100644
index 000000000..cf3b128e5
--- /dev/null
+++ b/app/Models/TwitterAccount.php
@@ -0,0 +1,85 @@
+<?php
+
+namespace App\Models;
+
+use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\SoftDeletes;
+use Illuminate\Database\Eloquent\Factories\HasFactory;
+use GoldSpecDigital\LaravelEloquentUUID\Database\Eloquent\Uuid;
+
+class TwitterAccount extends Model
+{
+    use HasFactory;
+    use SoftDeletes;
+    use Uuid;
+
+    protected $primaryKey = 'uuid';
+
+    /**
+     * The "type" of the auto-incrementing ID.
+     *
+     * @var string
+     */
+    protected $keyType = 'string';
+
+    /**
+     * Indicates if the IDs are auto-incrementing.
+     *
+     * @var bool
+     */
+    public $incrementing = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $guarded = [];
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'id',
+        'username',
+        'name',
+        'email',
+        'avatar',
+        'verified_at',
+        'user_id',
+    ];
+
+    /**
+     * The attributes that should be cast to native types.
+     *
+     * @var array
+     */
+    protected $casts = [
+        'verified_at' => 'datetime',
+    ];
+
+    /** 
+     * The attributes that should be hidden
+     * 
+     * @var array
+     */
+    protected $hidden = [
+        'aid',
+    ];
+
+    public function touchVerify()
+    {
+        $this->verified_at = $this->freshTimestamp();
+        return $this->save();
+    }
+
+    /**
+     * Get the user associated with the gamejolt account.
+     */
+    public function user()
+    {
+        return $this->hasOne(User::class, 'id', 'user_id');
+    }
+}
diff --git a/app/Models/User.php b/app/Models/User.php
index b23c316f9..509f0af2f 100644
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -106,4 +106,12 @@ public function forum()
     {
         return $this->hasOne(ForumAccount::class);
     }
+
+    /**
+     * Get the twitter account associated with the user.
+     */
+    public function twitter()
+    {
+        return $this->hasOne(TwitterAccount::class);
+    }
 }
diff --git a/composer.json b/composer.json
index c506fd9a0..ea362fb18 100644
--- a/composer.json
+++ b/composer.json
@@ -42,6 +42,7 @@
         "power-components/livewire-powergrid": "^1.5",
         "restcord/restcord": "dev-develop",
         "sentry/sentry-laravel": "^2.5",
+        "socialiteproviders/twitter": "^4.1",
         "spatie/cpu-load-health-check": "^1.0",
         "spatie/laravel-activitylog": "^3.16",
         "spatie/laravel-cookie-consent": "^2.12",
diff --git a/composer.lock b/composer.lock
index f0eec0e1d..4b569e596 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +4,7 @@
         "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
         "This file is @generated automatically"
     ],
-    "content-hash": "ecd405b91581ce69304bd7db1344209f",
+    "content-hash": "e0823281fe39c2150e39e262d86e813d",
     "packages": [
         {
             "name": "anlutro/l4-settings",
@@ -7996,6 +7996,114 @@
             ],
             "time": "2021-09-20T13:50:15+00:00"
         },
+        {
+            "name": "socialiteproviders/manager",
+            "version": "4.0.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Manager.git",
+                "reference": "0f5e82af0404df0080bdc5c105cef936c1711524"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Manager/zipball/0f5e82af0404df0080bdc5c105cef936c1711524",
+                "reference": "0f5e82af0404df0080bdc5c105cef936c1711524",
+                "shasum": ""
+            },
+            "require": {
+                "illuminate/support": "^6.0|^7.0|^8.0",
+                "laravel/socialite": "~4.0|~5.0",
+                "php": "^7.2 || ^8.0"
+            },
+            "require-dev": {
+                "mockery/mockery": "^1.2",
+                "phpunit/phpunit": "^9.0"
+            },
+            "type": "library",
+            "extra": {
+                "laravel": {
+                    "providers": [
+                        "SocialiteProviders\\Manager\\ServiceProvider"
+                    ]
+                }
+            },
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Manager\\": "src/"
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Andy Wendt",
+                    "email": "andy@awendt.com"
+                },
+                {
+                    "name": "Anton Komarev",
+                    "email": "a.komarev@cybercog.su"
+                },
+                {
+                    "name": "Miguel Piedrafita",
+                    "email": "soy@miguelpiedrafita.com"
+                },
+                {
+                    "name": "atymic",
+                    "email": "atymicq@gmail.com",
+                    "homepage": "https://atymic.dev"
+                }
+            ],
+            "description": "Easily add new or override built-in providers in Laravel Socialite.",
+            "homepage": "https://socialiteproviders.com/",
+            "support": {
+                "issues": "https://github.com/SocialiteProviders/Manager/issues",
+                "source": "https://github.com/SocialiteProviders/Manager/tree/4.0.1"
+            },
+            "time": "2020-12-01T23:09:06+00:00"
+        },
+        {
+            "name": "socialiteproviders/twitter",
+            "version": "4.1.1",
+            "source": {
+                "type": "git",
+                "url": "https://github.com/SocialiteProviders/Twitter.git",
+                "reference": "e5edf2b6e3f37e64be6488111629ed5e41e645ad"
+            },
+            "dist": {
+                "type": "zip",
+                "url": "https://api.github.com/repos/SocialiteProviders/Twitter/zipball/e5edf2b6e3f37e64be6488111629ed5e41e645ad",
+                "reference": "e5edf2b6e3f37e64be6488111629ed5e41e645ad",
+                "shasum": ""
+            },
+            "require": {
+                "ext-json": "*",
+                "php": "^7.2 || ^8.0",
+                "socialiteproviders/manager": "~4.0"
+            },
+            "type": "library",
+            "autoload": {
+                "psr-4": {
+                    "SocialiteProviders\\Twitter\\": ""
+                }
+            },
+            "notification-url": "https://packagist.org/downloads/",
+            "license": [
+                "MIT"
+            ],
+            "authors": [
+                {
+                    "name": "Brian Faust",
+                    "email": "hello@brianfaust.de"
+                }
+            ],
+            "description": "Twitter OAuth1 Provider for Laravel Socialite",
+            "support": {
+                "source": "https://github.com/SocialiteProviders/Twitter/tree/4.1.1"
+            },
+            "time": "2021-01-29T05:41:11+00:00"
+        },
         {
             "name": "spatie/cpu-load-health-check",
             "version": "1.0.2",
diff --git a/config/services.php b/config/services.php
index 34f13d044..14ad60b25 100644
--- a/config/services.php
+++ b/config/services.php
@@ -36,4 +36,10 @@
         'redirect' => env('DISCORD_REDIRECT_URI', '/login/discord/callback'),
     ],
 
+    'twitter' => [    
+        'client_id' => env('TWITTER_CLIENT_ID'),  
+        'client_secret' => env('TWITTER_CLIENT_SECRET'),  
+        'redirect' => env('TWITTER_REDIRECT_URI', '/login/twitter/callback'),
+    ],
+
 ];
diff --git a/database/migrations/2022_01_03_195850_create_twitter_accounts_table.php b/database/migrations/2022_01_03_195850_create_twitter_accounts_table.php
new file mode 100644
index 000000000..a4f7ffce8
--- /dev/null
+++ b/database/migrations/2022_01_03_195850_create_twitter_accounts_table.php
@@ -0,0 +1,40 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+class CreateTwitterAccountsTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::create('twitter_accounts', function (Blueprint $table) {
+            $table->increments('aid');
+            $table->uuid('uuid')->unique();
+            $table->bigInteger('id')->comment('Twitter ID');
+            $table->text('username')->comment('Twitter Username');
+            $table->text('name')->comment('Twitter Name');
+            $table->text('email')->comment('Twitter Email');
+            $table->text('avatar')->comment('Twitter Avatar URL');
+            $table->timestamp('verified_at')->nullable();
+            $table->unsignedBigInteger('user_id');
+            $table->timestamps();
+            $table->softDeletes();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::dropIfExists('twitter_accounts');
+    }
+}
diff --git a/resources/views/components/achievement.blade.php b/resources/views/components/achievement.blade.php
index 7c3232a58..d97390ef9 100644
--- a/resources/views/components/achievement.blade.php
+++ b/resources/views/components/achievement.blade.php
@@ -8,6 +8,12 @@
             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" viewBox="0 0 20 20" fill="currentColor">
                 <path fill-rule="evenodd" d="M11.3 1.046A1 1 0 0112 2v5h4a1 1 0 01.82 1.573l-7 10A1 1 0 018 18v-5H4a1 1 0 01-.82-1.573l7-10a1 1 0 011.12-.38z" clip-rule="evenodd" />
             </svg>
+        @elseif ($achievement->name == 'AssociatedTwitter')
+            <svg class="w-6 h-6" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 248 204">
+                <g>
+                    <path d="M221.95,51.29c0.15,2.17,0.15,4.34,0.15,6.53c0,66.73-50.8,143.69-143.69,143.69v-0.04   C50.97,201.51,24.1,193.65,1,178.83c3.99,0.48,8,0.72,12.02,0.73c22.74,0.02,44.83-7.61,62.72-21.66   c-21.61-0.41-40.56-14.5-47.18-35.07c7.57,1.46,15.37,1.16,22.8-0.87C27.8,117.2,10.85,96.5,10.85,72.46c0-0.22,0-0.43,0-0.64   c7.02,3.91,14.88,6.08,22.92,6.32C11.58,63.31,4.74,33.79,18.14,10.71c25.64,31.55,63.47,50.73,104.08,52.76   c-4.07-17.54,1.49-35.92,14.61-48.25c20.34-19.12,52.33-18.14,71.45,2.19c11.31-2.23,22.15-6.38,32.07-12.26   c-3.77,11.69-11.66,21.62-22.2,27.93c10.01-1.18,19.79-3.86,29-7.95C240.37,35.29,231.83,44.14,221.95,51.29z" fill="currentColor"/>
+                </g>
+            </svg>
         @else
             <svg xmlns="http://www.w3.org/2000/svg" class="w-6 h-6" fill="none" viewBox="0 0 24 24" stroke="currentColor">
                 <path stroke-linecap="round" stroke-linejoin="round" stroke-width="2" d="M11 4a2 2 0 114 0v1a1 1 0 001 1h3a1 1 0 011 1v3a1 1 0 01-1 1h-1a2 2 0 100 4h1a1 1 0 011 1v3a1 1 0 01-1 1h-3a1 1 0 01-1-1v-1a2 2 0 10-4 0v1a1 1 0 01-1 1H7a1 1 0 01-1-1v-3a1 1 0 00-1-1H4a2 2 0 110-4h1a1 1 0 001-1V7a1 1 0 011-1h3a1 1 0 001-1V4z" />
diff --git a/resources/views/livewire/profile/twitter-account.blade.php b/resources/views/livewire/profile/twitter-account.blade.php
new file mode 100644
index 000000000..07f9cc3ea
--- /dev/null
+++ b/resources/views/livewire/profile/twitter-account.blade.php
@@ -0,0 +1,45 @@
+<x-jet-action-section>
+    <x-slot name="title">
+        <svg class="inline-block w-auto h-5" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 248 204">
+            <g>
+                <path d="M221.95,51.29c0.15,2.17,0.15,4.34,0.15,6.53c0,66.73-50.8,143.69-143.69,143.69v-0.04   C50.97,201.51,24.1,193.65,1,178.83c3.99,0.48,8,0.72,12.02,0.73c22.74,0.02,44.83-7.61,62.72-21.66   c-21.61-0.41-40.56-14.5-47.18-35.07c7.57,1.46,15.37,1.16,22.8-0.87C27.8,117.2,10.85,96.5,10.85,72.46c0-0.22,0-0.43,0-0.64   c7.02,3.91,14.88,6.08,22.92,6.32C11.58,63.31,4.74,33.79,18.14,10.71c25.64,31.55,63.47,50.73,104.08,52.76   c-4.07-17.54,1.49-35.92,14.61-48.25c20.34-19.12,52.33-18.14,71.45,2.19c11.31-2.23,22.15-6.38,32.07-12.26   c-3.77,11.69-11.66,21.62-22.2,27.93c10.01-1.18,19.79-3.86,29-7.95C240.37,35.29,231.83,44.14,221.95,51.29z" fill="currentColor"/>
+            </g>
+        </svg>
+        Twitter
+    </x-slot>
+
+    <x-slot name="description">
+        <span class="inline-block">{{ __('Link your account with your Twitter account.') }}</span>
+        <span class="inline-block mt-2">{{ __('Last Updated:') }} {{ $updated_at ?? 'Never.' }} &middot; {{ __('Last Verified:') }} {{ $verified_at ?? 'Never.' }}</span>
+    </x-slot>
+
+    <x-slot name="content">
+        @if (!isset($username))
+            <a href="{{ route('twitter.login') }}" class="flex items-center justify-center w-full px-4 py-3 text-sm font-semibold tracking-widest text-white uppercase transition bg-blue-600 border border-transparent rounded-md hover:bg-blue-700 active:bg-blue-400 focus:outline-none focus:border-blue-900 focus:ring focus:ring-blue-300 disabled:opacity-25">
+                <svg class="inline-block w-auto h-4 mr-1" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 248 204">
+                    <g>
+                        <path d="M221.95,51.29c0.15,2.17,0.15,4.34,0.15,6.53c0,66.73-50.8,143.69-143.69,143.69v-0.04   C50.97,201.51,24.1,193.65,1,178.83c3.99,0.48,8,0.72,12.02,0.73c22.74,0.02,44.83-7.61,62.72-21.66   c-21.61-0.41-40.56-14.5-47.18-35.07c7.57,1.46,15.37,1.16,22.8-0.87C27.8,117.2,10.85,96.5,10.85,72.46c0-0.22,0-0.43,0-0.64   c7.02,3.91,14.88,6.08,22.92,6.32C11.58,63.31,4.74,33.79,18.14,10.71c25.64,31.55,63.47,50.73,104.08,52.76   c-4.07-17.54,1.49-35.92,14.61-48.25c20.34-19.12,52.33-18.14,71.45,2.19c11.31-2.23,22.15-6.38,32.07-12.26   c-3.77,11.69-11.66,21.62-22.2,27.93c10.01-1.18,19.79-3.86,29-7.95C240.37,35.29,231.83,44.14,221.95,51.29z" fill="currentColor"/>
+                    </g>
+                </svg>
+                Login with Twitter
+            </a>
+        @else
+            <div class="flex mb-5 text-gray-600 bg-white rounded shadow dark:text-gray-200 dark:bg-black w-max">
+                <div class="self-center p-2 pr-1">
+                    <img data="picture" class="w-12 h-12 rounded-full" src="{{ $avatar }}" alt="{{ $username }}" />
+                </div>
+                <div class="self-center w-64 p-2">
+                    {{ $name }}
+                    <div class="-mt-1 text-sm text-gray-400">{{ '@'.$username }}</div>
+                </div>
+            </div>
+
+            <div class="mt-4">
+                <x-jet-danger-button wire:click="remove" wire:loading.attr="disabled">
+                    {{ __('Remove Association') }}
+                </x-jet-danger-button>
+            </div>
+        @endif
+    </x-slot>
+
+</x-jet-form-section>
diff --git a/resources/views/member/show.blade.php b/resources/views/member/show.blade.php
index ead89ad00..66ac32381 100644
--- a/resources/views/member/show.blade.php
+++ b/resources/views/member/show.blade.php
@@ -110,6 +110,24 @@
                                         </div>
                                     </div>
                                 @endif
+                                @if($user->twitter)
+                                    <div class="pt-2 mt-2 border-t border-slate-200 dark:border-slate-700">
+                                        <svg class="inline-block w-auto h-10 mr-1" xmlns="http://www.w3.org/2000/svg" fill="none" viewBox="0 0 248 204">
+                                            <g>
+                                                <path d="M221.95,51.29c0.15,2.17,0.15,4.34,0.15,6.53c0,66.73-50.8,143.69-143.69,143.69v-0.04   C50.97,201.51,24.1,193.65,1,178.83c3.99,0.48,8,0.72,12.02,0.73c22.74,0.02,44.83-7.61,62.72-21.66   c-21.61-0.41-40.56-14.5-47.18-35.07c7.57,1.46,15.37,1.16,22.8-0.87C27.8,117.2,10.85,96.5,10.85,72.46c0-0.22,0-0.43,0-0.64   c7.02,3.91,14.88,6.08,22.92,6.32C11.58,63.31,4.74,33.79,18.14,10.71c25.64,31.55,63.47,50.73,104.08,52.76   c-4.07-17.54,1.49-35.92,14.61-48.25c20.34-19.12,52.33-18.14,71.45,2.19c11.31-2.23,22.15-6.38,32.07-12.26   c-3.77,11.69-11.66,21.62-22.2,27.93c10.01-1.18,19.79-3.86,29-7.95C240.37,35.29,231.83,44.14,221.95,51.29z" fill="currentColor"/>
+                                            </g>
+                                        </svg> Twitter
+                                        <div class="flex mb-5 text-gray-600 bg-white rounded shadow dark:text-gray-200 dark:bg-black w-max">
+                                            <div class="self-center p-2 pr-1">
+                                                <img data="picture" class="w-12 h-12 rounded-full" src="{{ $user->twitter->avatar }}" alt="{{ $user->twitter->username }}" />
+                                            </div>
+                                            <div class="self-center w-64 p-2">
+                                                <a class="hover:underline" href="https://twitter.com/{{ $user->twitter->username }}">{{ $user->twitter->name }}</a>
+                                                <div class="-mt-1 text-sm text-gray-400">{{ '@'.$user->twitter->username }}</div>
+                                            </div>
+                                        </div>
+                                    </div>
+                                @endif
                             </div>
                             <div x-show="activeTab===3">
                                 @if($user->gamejolt)
diff --git a/resources/views/profile/edit.blade.php b/resources/views/profile/edit.blade.php
index 03459dc73..4fe6937ac 100644
--- a/resources/views/profile/edit.blade.php
+++ b/resources/views/profile/edit.blade.php
@@ -28,6 +28,11 @@
                 <x-jet-section-border />
             @endif
 
+            @if(config("services.twitter.client_id") && config("services.twitter.client_secret"))
+                @livewire('profile.twitter-account')
+                <x-jet-section-border />
+            @endif
+
             @livewire('profile.preference')
             <x-jet-section-border />
 
diff --git a/routes/web.php b/routes/web.php
index 5f2d491e8..abd1ecab5 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -12,6 +12,7 @@
 use App\Http\Controllers\PermissionController;
 use App\Http\Controllers\Skin\ImportController;
 use App\Http\Controllers\Auth\DiscordController;
+use App\Http\Controllers\Auth\TwitterController;
 use App\Http\Controllers\Skin\SkinHomeController;
 use App\Http\Controllers\Skin\PlayerSkinController;
 use App\Http\Controllers\Skin\UploadedSkinController;
@@ -51,6 +52,8 @@
 Route::group(['prefix' => 'login'], function () {
     Route::get('/discord', [DiscordController::class, 'redirectToProvider'])->name('discord.login');
     Route::get('/discord/callback', [DiscordController::class, 'handleProviderCallback']);
+    Route::get('/twitter', [TwitterController::class, 'redirectToProvider'])->name('twitter.login');
+    Route::get('/twitter/callback', [TwitterController::class, 'handleProviderCallback']);
 });
 
 Route::group(['middleware' => ['auth:sanctum', 'verified']], function () {