diff --git a/client/src/app/account/account-settings/account-change-password/index.ts b/client/src/app/account/account-settings/account-change-password/index.ts
deleted file mode 100644
index 44c330b66..000000000
--- a/client/src/app/account/account-settings/account-change-password/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './account-change-password.component'
diff --git a/client/src/app/account/account-settings/account-details/index.ts b/client/src/app/account/account-settings/account-details/index.ts
deleted file mode 100644
index 4829f608a..000000000
--- a/client/src/app/account/account-settings/account-details/index.ts
+++ /dev/null
@@ -1 +0,0 @@
-export * from './account-details.component'
diff --git a/client/src/app/account/account.component.html b/client/src/app/account/account.component.html
deleted file mode 100644
index d82a4ca4d..000000000
--- a/client/src/app/account/account.component.html
+++ /dev/null
@@ -1,11 +0,0 @@
-<div class="row">
-  <div class="sub-menu">
-    <a routerLink="/account/settings" routerLinkActive="active" class="title-page">My account</a>
-
-    <a routerLink="/account/videos" routerLinkActive="active" class="title-page">My videos</a>
-  </div>
-
-  <div class="margin-content">
-    <router-outlet></router-outlet>
-  </div>
-</div>
diff --git a/client/src/app/account/account.component.scss b/client/src/app/account/account.component.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/client/src/app/account/account.component.ts b/client/src/app/account/account.component.ts
deleted file mode 100644
index 3d3677ab0..000000000
--- a/client/src/app/account/account.component.ts
+++ /dev/null
@@ -1,8 +0,0 @@
-import { Component } from '@angular/core'
-
-@Component({
-  selector: 'my-account',
-  templateUrl: './account.component.html',
-  styleUrls: [ './account.component.scss' ]
-})
-export class AccountComponent {}
diff --git a/client/src/app/account/account.module.ts b/client/src/app/account/account.module.ts
deleted file mode 100644
index 2299c1919..000000000
--- a/client/src/app/account/account.module.ts
+++ /dev/null
@@ -1,30 +0,0 @@
-import { NgModule } from '@angular/core'
-import { SharedModule } from '../shared'
-import { AccountRoutingModule } from './account-routing.module'
-import { AccountChangePasswordComponent } from './account-settings/account-change-password/account-change-password.component'
-import { AccountDetailsComponent } from './account-settings/account-details/account-details.component'
-import { AccountSettingsComponent } from './account-settings/account-settings.component'
-import { AccountComponent } from './account.component'
-import { AccountVideosComponent } from './account-videos/account-videos.component'
-
-@NgModule({
-  imports: [
-    AccountRoutingModule,
-    SharedModule
-  ],
-
-  declarations: [
-    AccountComponent,
-    AccountSettingsComponent,
-    AccountChangePasswordComponent,
-    AccountDetailsComponent,
-    AccountVideosComponent
-  ],
-
-  exports: [
-    AccountComponent
-  ],
-
-  providers: []
-})
-export class AccountModule { }
diff --git a/client/src/app/account/index.ts b/client/src/app/account/index.ts
deleted file mode 100644
index dc56ffdbd..000000000
--- a/client/src/app/account/index.ts
+++ /dev/null
@@ -1,3 +0,0 @@
-export * from './account-routing.module'
-export * from './account.component'
-export * from './account.module'
diff --git a/client/src/app/app.module.ts b/client/src/app/app.module.ts
index 77d68a4ec..c22632fb8 100644
--- a/client/src/app/app.module.ts
+++ b/client/src/app/app.module.ts
@@ -6,7 +6,7 @@ import { ResetPasswordModule } from '@app/reset-password'
 
 import { MetaLoader, MetaModule, MetaStaticLoader, PageTitlePositioning } from '@ngx-meta/core'
 
-import { AccountModule } from './account'
+import { MyAccountModule } from './my-account'
 
 import { AppRoutingModule } from './app-routing.module'
 import { AppComponent } from './app.component'
@@ -46,7 +46,7 @@ export function metaFactory (serverService: ServerService): MetaLoader {
 
     AppRoutingModule,
 
-    AccountModule,
+    MyAccountModule,
     CoreModule,
     LoginModule,
     ResetPasswordModule,
diff --git a/client/src/app/menu/menu.component.html b/client/src/app/menu/menu.component.html
index d827a4dd4..832cd9e78 100644
--- a/client/src/app/menu/menu.component.html
+++ b/client/src/app/menu/menu.component.html
@@ -5,7 +5,7 @@
     </a>
 
     <div class="logged-in-info">
-      <a routerLink="/account/settings" class="logged-in-username">{{ user.username }}</a>
+      <a routerLink="/my-account/settings" class="logged-in-username">{{ user.username }}</a>
       <div class="logged-in-email">{{ user.email }}</div>
     </div>
 
@@ -14,7 +14,7 @@
 
       <ul *dropdownMenu class="dropdown-menu">
         <li>
-          <a i18n routerLink="/account/settings" class="dropdown-item" title="My account">
+          <a i18n routerLink="/my-account/settings" class="dropdown-item" title="My account">
             My account
           </a>
 
diff --git a/client/src/app/my-account/index.ts b/client/src/app/my-account/index.ts
new file mode 100644
index 000000000..3df96dd7a
--- /dev/null
+++ b/client/src/app/my-account/index.ts
@@ -0,0 +1,3 @@
+export * from './my-account-routing.module'
+export * from './my-account.component'
+export * from './my-account.module'
diff --git a/client/src/app/account/account-routing.module.ts b/client/src/app/my-account/my-account-routing.module.ts
similarity index 52%
rename from client/src/app/account/account-routing.module.ts
rename to client/src/app/my-account/my-account-routing.module.ts
index 070b9b5c5..5a61db41f 100644
--- a/client/src/app/account/account-routing.module.ts
+++ b/client/src/app/my-account/my-account-routing.module.ts
@@ -1,22 +1,20 @@
 import { NgModule } from '@angular/core'
 import { RouterModule, Routes } from '@angular/router'
-
 import { MetaGuard } from '@ngx-meta/core'
-
 import { LoginGuard } from '../core'
-import { AccountComponent } from './account.component'
-import { AccountSettingsComponent } from './account-settings/account-settings.component'
-import { AccountVideosComponent } from './account-videos/account-videos.component'
+import { MyAccountComponent } from './my-account.component'
+import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component'
+import { MyAccountVideosComponent } from './my-account-videos/my-account-videos.component'
 
-const accountRoutes: Routes = [
+const myAccountRoutes: Routes = [
   {
-    path: 'account',
-    component: AccountComponent,
+    path: 'my-account',
+    component: MyAccountComponent,
     canActivateChild: [ MetaGuard, LoginGuard ],
     children: [
       {
         path: 'settings',
-        component: AccountSettingsComponent,
+        component: MyAccountSettingsComponent,
         data: {
           meta: {
             title: 'Account settings'
@@ -25,7 +23,7 @@ const accountRoutes: Routes = [
       },
       {
         path: 'videos',
-        component: AccountVideosComponent,
+        component: MyAccountVideosComponent,
         data: {
           meta: {
             title: 'Account videos'
@@ -37,7 +35,7 @@ const accountRoutes: Routes = [
 ]
 
 @NgModule({
-  imports: [ RouterModule.forChild(accountRoutes) ],
+  imports: [ RouterModule.forChild(myAccountRoutes) ],
   exports: [ RouterModule ]
 })
-export class AccountRoutingModule {}
+export class MyAccountRoutingModule {}
diff --git a/client/src/app/my-account/my-account-settings/my-account-change-password/index.ts b/client/src/app/my-account/my-account-settings/my-account-change-password/index.ts
new file mode 100644
index 000000000..644047c5f
--- /dev/null
+++ b/client/src/app/my-account/my-account-settings/my-account-change-password/index.ts
@@ -0,0 +1 @@
+export * from './my-account-change-password.component'
diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.html b/client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html
similarity index 100%
rename from client/src/app/account/account-settings/account-change-password/account-change-password.component.html
rename to client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.html
diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.scss b/client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss
similarity index 100%
rename from client/src/app/account/account-settings/account-change-password/account-change-password.component.scss
rename to client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.scss
diff --git a/client/src/app/account/account-settings/account-change-password/account-change-password.component.ts b/client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
similarity index 87%
rename from client/src/app/account/account-settings/account-change-password/account-change-password.component.ts
rename to client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
index 8979e1734..80af668f9 100644
--- a/client/src/app/account/account-settings/account-change-password/account-change-password.component.ts
+++ b/client/src/app/my-account/my-account-settings/my-account-change-password/my-account-change-password.component.ts
@@ -5,10 +5,10 @@ import { FormReactive, USER_PASSWORD, UserService } from '../../../shared'
 
 @Component({
   selector: 'my-account-change-password',
-  templateUrl: './account-change-password.component.html',
-  styleUrls: [ './account-change-password.component.scss' ]
+  templateUrl: './my-account-change-password.component.html',
+  styleUrls: [ './my-account-change-password.component.scss' ]
 })
-export class AccountChangePasswordComponent extends FormReactive implements OnInit {
+export class MyAccountChangePasswordComponent extends FormReactive implements OnInit {
   error: string = null
 
   form: FormGroup
diff --git a/client/src/app/my-account/my-account-settings/my-account-details/index.ts b/client/src/app/my-account/my-account-settings/my-account-details/index.ts
new file mode 100644
index 000000000..b7f58e329
--- /dev/null
+++ b/client/src/app/my-account/my-account-settings/my-account-details/index.ts
@@ -0,0 +1 @@
+export * from './my-account-details.component'
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.html b/client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.html
similarity index 100%
rename from client/src/app/account/account-settings/account-details/account-details.component.html
rename to client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.html
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.scss b/client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.scss
similarity index 100%
rename from client/src/app/account/account-settings/account-details/account-details.component.scss
rename to client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.scss
diff --git a/client/src/app/account/account-settings/account-details/account-details.component.ts b/client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.ts
similarity index 88%
rename from client/src/app/account/account-settings/account-details/account-details.component.ts
rename to client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.ts
index de213717e..4c1456541 100644
--- a/client/src/app/account/account-settings/account-details/account-details.component.ts
+++ b/client/src/app/my-account/my-account-settings/my-account-details/my-account-details.component.ts
@@ -7,11 +7,10 @@ import { FormReactive, User, UserService } from '../../../shared'
 
 @Component({
   selector: 'my-account-details',
-  templateUrl: './account-details.component.html',
-  styleUrls: [ './account-details.component.scss' ]
+  templateUrl: './my-account-details.component.html',
+  styleUrls: [ './my-account-details.component.scss' ]
 })
-
-export class AccountDetailsComponent extends FormReactive implements OnInit {
+export class MyAccountDetailsComponent extends FormReactive implements OnInit {
   @Input() user: User = null
 
   form: FormGroup
diff --git a/client/src/app/account/account-settings/account-settings.component.html b/client/src/app/my-account/my-account-settings/my-account-settings.component.html
similarity index 100%
rename from client/src/app/account/account-settings/account-settings.component.html
rename to client/src/app/my-account/my-account-settings/my-account-settings.component.html
diff --git a/client/src/app/account/account-settings/account-settings.component.scss b/client/src/app/my-account/my-account-settings/my-account-settings.component.scss
similarity index 100%
rename from client/src/app/account/account-settings/account-settings.component.scss
rename to client/src/app/my-account/my-account-settings/my-account-settings.component.scss
diff --git a/client/src/app/account/account-settings/account-settings.component.ts b/client/src/app/my-account/my-account-settings/my-account-settings.component.ts
similarity index 91%
rename from client/src/app/account/account-settings/account-settings.component.ts
rename to client/src/app/my-account/my-account-settings/my-account-settings.component.ts
index 524607817..91420cc6f 100644
--- a/client/src/app/account/account-settings/account-settings.component.ts
+++ b/client/src/app/my-account/my-account-settings/my-account-settings.component.ts
@@ -8,10 +8,10 @@ import { UserService } from '../../shared/users'
 
 @Component({
   selector: 'my-account-settings',
-  templateUrl: './account-settings.component.html',
-  styleUrls: [ './account-settings.component.scss' ]
+  templateUrl: './my-account-settings.component.html',
+  styleUrls: [ './my-account-settings.component.scss' ]
 })
-export class AccountSettingsComponent implements OnInit {
+export class MyAccountSettingsComponent implements OnInit {
   @ViewChild('avatarfileInput') avatarfileInput
 
   user: User = null
diff --git a/client/src/app/account/account-videos/account-videos.component.html b/client/src/app/my-account/my-account-videos/my-account-videos.component.html
similarity index 100%
rename from client/src/app/account/account-videos/account-videos.component.html
rename to client/src/app/my-account/my-account-videos/my-account-videos.component.html
diff --git a/client/src/app/account/account-videos/account-videos.component.scss b/client/src/app/my-account/my-account-videos/my-account-videos.component.scss
similarity index 100%
rename from client/src/app/account/account-videos/account-videos.component.scss
rename to client/src/app/my-account/my-account-videos/my-account-videos.component.scss
diff --git a/client/src/app/account/account-videos/account-videos.component.ts b/client/src/app/my-account/my-account-videos/my-account-videos.component.ts
similarity index 94%
rename from client/src/app/account/account-videos/account-videos.component.ts
rename to client/src/app/my-account/my-account-videos/my-account-videos.component.ts
index 91bc1b695..a6cef361e 100644
--- a/client/src/app/account/account-videos/account-videos.component.ts
+++ b/client/src/app/my-account/my-account-videos/my-account-videos.component.ts
@@ -15,12 +15,12 @@ import { VideoService } from '../../shared/video/video.service'
 
 @Component({
   selector: 'my-account-videos',
-  templateUrl: './account-videos.component.html',
-  styleUrls: [ './account-videos.component.scss' ]
+  templateUrl: './my-account-videos.component.html',
+  styleUrls: [ './my-account-videos.component.scss' ]
 })
-export class AccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
+export class MyAccountVideosComponent extends AbstractVideoList implements OnInit, OnDestroy {
   titlePage = 'My videos'
-  currentRoute = '/account/videos'
+  currentRoute = '/my-account/videos'
   checkedVideos: { [ id: number ]: boolean } = {}
   pagination: ComponentPagination = {
     currentPage: 1,
diff --git a/client/src/app/my-account/my-account.component.html b/client/src/app/my-account/my-account.component.html
new file mode 100644
index 000000000..637b2587c
--- /dev/null
+++ b/client/src/app/my-account/my-account.component.html
@@ -0,0 +1,11 @@
+<div class="row">
+  <div class="sub-menu">
+    <a routerLink="/my-account/settings" routerLinkActive="active" class="title-page">My account</a>
+
+    <a routerLink="/my-account/videos" routerLinkActive="active" class="title-page">My videos</a>
+  </div>
+
+  <div class="margin-content">
+    <router-outlet></router-outlet>
+  </div>
+</div>
diff --git a/client/src/app/my-account/my-account.component.ts b/client/src/app/my-account/my-account.component.ts
new file mode 100644
index 000000000..0955e2b7b
--- /dev/null
+++ b/client/src/app/my-account/my-account.component.ts
@@ -0,0 +1,7 @@
+import { Component } from '@angular/core'
+
+@Component({
+  selector: 'my-account',
+  templateUrl: './my-account.component.html'
+})
+export class MyAccountComponent {}
diff --git a/client/src/app/my-account/my-account.module.ts b/client/src/app/my-account/my-account.module.ts
new file mode 100644
index 000000000..317277304
--- /dev/null
+++ b/client/src/app/my-account/my-account.module.ts
@@ -0,0 +1,30 @@
+import { NgModule } from '@angular/core'
+import { SharedModule } from '../shared'
+import { MyAccountRoutingModule } from './my-account-routing.module'
+import { MyAccountChangePasswordComponent } from './my-account-settings/my-account-change-password/my-account-change-password.component'
+import { MyAccountDetailsComponent } from './my-account-settings/my-account-details/my-account-details.component'
+import { MyAccountSettingsComponent } from './my-account-settings/my-account-settings.component'
+import { MyAccountComponent } from './my-account.component'
+import { MyAccountVideosComponent } from './my-account-videos/my-account-videos.component'
+
+@NgModule({
+  imports: [
+    MyAccountRoutingModule,
+    SharedModule
+  ],
+
+  declarations: [
+    MyAccountComponent,
+    MyAccountSettingsComponent,
+    MyAccountChangePasswordComponent,
+    MyAccountDetailsComponent,
+    MyAccountVideosComponent
+  ],
+
+  exports: [
+    MyAccountComponent
+  ],
+
+  providers: []
+})
+export class MyAccountModule { }