diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.jsx
index e00894e3eb..b43c3338dc 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/App.jsx
@@ -63,7 +63,7 @@ class Base extends Component {
     }
 
     render() {
-        console.log('came here/////');
+        console.log('came to base ../////');
         if (this.state.user !== null) {
             return (
                 <div>
@@ -107,12 +107,13 @@ class Store extends Component {
     }
 
     render() {
+        console.log('came to store');
         return (
             <div className="App">
                 <Router basename="store" history={history}>
                     <Switch>
-                        <Route path="/login" component={Login}/>
-                        <Route path="/logout" component={Login}/>
+                        <Route exact path="/login" component={Login}/>
+                        <Route exact path="/logout" component={Login}/>
                         <Route component={Base}/>
                     </Switch>
                 </Router>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/UIComponents/UserOptions/UserOptions.jsx b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/UIComponents/UserOptions/UserOptions.jsx
index 76f42c3d3a..5ebdcfb0e4 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/UIComponents/UserOptions/UserOptions.jsx
+++ b/components/application-mgt/org.wso2.carbon.device.application.mgt.store.ui/src/main/resources/store/src/components/UIComponents/UserOptions/UserOptions.jsx
@@ -43,7 +43,7 @@ class UserOptions extends Component {
         if (this.state.user) {
             return (
                 <div id='user-options-drop-down' className="dropdown-content" style={{display: displayOptions}}>
-                    <a href="#">Logout</a>
+                    <a href="/store/logout">Logout</a>
                 </div>
             );
         } else {