diff --git a/framework/core/src/Admin/AdminServiceProvider.php b/framework/core/src/Admin/AdminServiceProvider.php
index 4c5afc217..a3b42a5ec 100644
--- a/framework/core/src/Admin/AdminServiceProvider.php
+++ b/framework/core/src/Admin/AdminServiceProvider.php
@@ -38,7 +38,7 @@ class AdminServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app['flarum.admin.assetManager'] = $this->app->share(function ($app) {
-            return new AssetManager($app['files'], $app['path.public'].'/flarum', 'admin');
+            return new AssetManager($app['files'], $app['path.public'].'/assets', 'admin');
         });
     }
 }
diff --git a/framework/core/src/Core/Models/User.php b/framework/core/src/Core/Models/User.php
index 8bbab5c47..e1480cbea 100755
--- a/framework/core/src/Core/Models/User.php
+++ b/framework/core/src/Core/Models/User.php
@@ -235,7 +235,7 @@ class User extends Model
      */
     public function getAvatarUrlAttribute()
     {
-        return $this->avatar_path ? asset('flarum/avatars/'.$this->avatar_path) : null;
+        return $this->avatar_path ? asset('assets/avatars/'.$this->avatar_path) : null;
     }
 
     /**
diff --git a/framework/core/src/Forum/ForumServiceProvider.php b/framework/core/src/Forum/ForumServiceProvider.php
index feec51f97..dc92e7f50 100644
--- a/framework/core/src/Forum/ForumServiceProvider.php
+++ b/framework/core/src/Forum/ForumServiceProvider.php
@@ -38,7 +38,7 @@ class ForumServiceProvider extends ServiceProvider
     public function register()
     {
         $this->app['flarum.forum.assetManager'] = $this->app->share(function ($app) {
-            return new AssetManager($app['files'], $app['path.public'].'/flarum', 'forum');
+            return new AssetManager($app['files'], $app['path.public'].'/assets', 'forum');
         });
     }
 }