diff --git a/client/src/App.js b/client/src/App.js
index 10a9370..bf9cc15 100644
--- a/client/src/App.js
+++ b/client/src/App.js
@@ -33,9 +33,9 @@
         <Router>
           <Switch>
             <Route exact path="/"><Redirect to="/account" /></Route>
-            <Route path="/account/:accountId" component={AccountSettings} />
+            <Route path="/account/:accountId" component={JamiMessenger} />
+            <Route path="/account/:accountId/settings" component={AccountSettings} />
             <Route path="/account" component={AccountSelection} />
-            <Route path="/messaging" component={JamiMessenger} />
             <Route component={NotFoundPage} />
           </Switch>
         </Router>