diff --git a/app/Console/Commands/AvatarDefaultMigration.php b/app/Console/Commands/AvatarDefaultMigration.php
index ba6252b9e..839a678e7 100644
--- a/app/Console/Commands/AvatarDefaultMigration.php
+++ b/app/Console/Commands/AvatarDefaultMigration.php
@@ -53,7 +53,11 @@ class AvatarDefaultMigration extends Command
 
         Avatar::whereChangeCount(0)->chunk(50, function($avatars) use ($bar) {
             foreach($avatars as $avatar) {
-                if($avatar->media_path == 'public/avatars/default.png' || $avatar->thumb_path == 'public/avatars/default.png') {
+                if( $avatar->media_path == 'public/avatars/default.png' || 
+                    $avatar->thumb_path == 'public/avatars/default.png' ||
+                    $avatar->media_path == 'public/avatars/default.jpg' || 
+                    $avatar->thumb_path == 'public/avatars/default.jpg' ||
+                ) {
                     continue;
                 }
 
diff --git a/app/Http/Controllers/AvatarController.php b/app/Http/Controllers/AvatarController.php
index 3a464ce10..6f0ec70ba 100644
--- a/app/Http/Controllers/AvatarController.php
+++ b/app/Http/Controllers/AvatarController.php
@@ -120,7 +120,12 @@ class AvatarController extends Controller
 
         $avatar = $profile->avatar;
 
-        if($avatar->media_path == 'public/avatars/default.png' || $avatar->thumb_path == 'public/avatars/default.png') {
+        if( $avatar->media_path == 'public/avatars/default.png' || 
+            $avatar->thumb_path == 'public/avatars/default.png' ||
+            $avatar->media_path == 'public/avatars/default.jpg' || 
+            $avatar->thumb_path == 'public/avatars/default.jpg' ||
+
+        ) {
             return;
         }
 
@@ -132,8 +137,8 @@ class AvatarController extends Controller
             @unlink(storage_path('app/' . $avatar->thumb_path));
         }
 
-        $avatar->media_path = 'public/avatars/default.png';
-        $avatar->thumb_path = 'public/avatars/default.png';
+        $avatar->media_path = 'public/avatars/default.jpg';
+        $avatar->thumb_path = 'public/avatars/default.jpg';
         $avatar->change_count = $avatar->change_count + 1;
         $avatar->save();
 
diff --git a/app/Jobs/AvatarPipeline/AvatarOptimize.php b/app/Jobs/AvatarPipeline/AvatarOptimize.php
index 89ba013d4..437627175 100644
--- a/app/Jobs/AvatarPipeline/AvatarOptimize.php
+++ b/app/Jobs/AvatarPipeline/AvatarOptimize.php
@@ -70,7 +70,10 @@ class AvatarOptimize implements ShouldQueue
 
     protected function deleteOldAvatar($new, $current)
     {
-        if (storage_path('app/'.$new) == $current || Str::endsWith($current, 'avatars/default.png')) {
+        if ( storage_path('app/'.$new) == $current || 
+             Str::endsWith($current, 'avatars/default.png') || 
+             Str::endsWith($current, 'avatars/default.jpg'))
+        {
             return;
         }
         if (is_file($current)) {
diff --git a/app/Jobs/AvatarPipeline/CreateAvatar.php b/app/Jobs/AvatarPipeline/CreateAvatar.php
index 21e785c6d..2df6c5184 100644
--- a/app/Jobs/AvatarPipeline/CreateAvatar.php
+++ b/app/Jobs/AvatarPipeline/CreateAvatar.php
@@ -41,7 +41,7 @@ class CreateAvatar implements ShouldQueue
     public function handle()
     {
         $profile = $this->profile;
-        $path = 'public/avatars/default.png';
+        $path = 'public/avatars/default.jpg';
         $avatar = new Avatar();
         $avatar->profile_id = $profile->id;
         $avatar->media_path = $path;
diff --git a/app/Observers/AvatarObserver.php b/app/Observers/AvatarObserver.php
index c8fef1a10..1406ceeb6 100644
--- a/app/Observers/AvatarObserver.php
+++ b/app/Observers/AvatarObserver.php
@@ -48,11 +48,17 @@ class AvatarObserver
     public function deleting(Avatar $avatar)
     {
         $path = storage_path('app/'.$avatar->media_path);
-        if(is_file($path) && $avatar->media_path != 'public/avatars/default.png') {
+        if( is_file($path) && 
+            $avatar->media_path != 'public/avatars/default.png' &&
+            $avatar->media_path != 'public/avatars/default.jpg'
+        ) {
             @unlink($path);
         }
         $path = storage_path('app/'.$avatar->thumb_path);
-        if(is_file($path) && $avatar->thumb_path != 'public/avatars/default.png') {
+        if( is_file($path) && 
+            $avatar->thumb_path != 'public/avatars/default.png' &&
+            $avatar->media_path != 'public/avatars/default.jpg'
+        ) {
             @unlink($path);
         }
     }
diff --git a/app/Profile.php b/app/Profile.php
index fb3540514..c88b876fb 100644
--- a/app/Profile.php
+++ b/app/Profile.php
@@ -156,7 +156,7 @@ class Profile extends Model
     public function avatar()
     {
         return $this->hasOne(Avatar::class)->withDefault([
-            'media_path' => 'public/avatars/default.png',
+            'media_path' => 'public/avatars/default.jpg',
             'change_count' => 0
         ]);
     }
diff --git a/app/Util/Lexer/RestrictedNames.php b/app/Util/Lexer/RestrictedNames.php
index 33f91b81d..e104b31d2 100644
--- a/app/Util/Lexer/RestrictedNames.php
+++ b/app/Util/Lexer/RestrictedNames.php
@@ -103,6 +103,8 @@ class RestrictedNames
 		'api',
 		'audio',
 		'auth',
+		'avatar',
+		'avatars',
 		'b',
 		'bartender',
 		'broadcast',
diff --git a/storage/app/public/avatars/.gitignore b/storage/app/public/avatars/.gitignore
index e841eefe2..a8a87b130 100644
--- a/storage/app/public/avatars/.gitignore
+++ b/storage/app/public/avatars/.gitignore
@@ -1,3 +1,4 @@
 *
 !.gitignore
-!default.png
\ No newline at end of file
+!default.png
+!default.jpg
\ No newline at end of file
diff --git a/storage/app/public/avatars/default.jpg b/storage/app/public/avatars/default.jpg
new file mode 100644
index 000000000..8dbe09bf8
Binary files /dev/null and b/storage/app/public/avatars/default.jpg differ
diff --git a/storage/app/public/avatars/default.png b/storage/app/public/avatars/default.png
index 351d4d88f..80f467309 100644
Binary files a/storage/app/public/avatars/default.png and b/storage/app/public/avatars/default.png differ