diff --git a/CHANGELOG.md b/CHANGELOG.md
index a2c745d0a..d8ebcf167 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -27,6 +27,7 @@ All notable, unreleased changes to this project will be documented in this file.
 - Throw error when API_URI is not set - #375 by @dominik-zeglen
 - Fix variant stock input - #377 by @dominik-zeglen
 - Add filtering to views - #361 by @dominik-zeglen
+- Do not render password change if authenticating - #378 by @dominik-zeglen
 
 ## 2.0.0
 
diff --git a/src/auth/index.tsx b/src/auth/index.tsx
index 4a5f92c2f..e57a0159b 100644
--- a/src/auth/index.tsx
+++ b/src/auth/index.tsx
@@ -12,6 +12,7 @@ import LoginView from "./views/Login";
 import NewPassword from "./views/NewPassword";
 import ResetPassword from "./views/ResetPassword";
 import ResetPasswordSuccess from "./views/ResetPasswordSuccess";
+import LoginLoading from "./components/LoginLoading";
 
 interface UserContext {
   login: (username: string, password: string) => void;
@@ -30,12 +31,20 @@ export const UserContext = React.createContext<UserContext>({
   tokenVerifyLoading: false
 });
 
-const AuthRouter: React.FC = () => (
+interface AuthRouterProps {
+  hasToken: boolean;
+}
+
+const AuthRouter: React.FC<AuthRouterProps> = ({ hasToken }) => (
   <Layout>
     <Switch>
       <Route path={passwordResetSuccessPath} component={ResetPasswordSuccess} />
       <Route path={passwordResetPath} component={ResetPassword} />
-      <Route path={newPasswordPath} component={NewPassword} />
+      {!hasToken ? (
+        <Route path={newPasswordPath} component={NewPassword} />
+      ) : (
+        <LoginLoading />
+      )}
       <Route component={LoginView} />
     </Switch>
   </Layout>
diff --git a/src/index.tsx b/src/index.tsx
index 915593649..9339671bf 100644
--- a/src/index.tsx
+++ b/src/index.tsx
@@ -275,7 +275,7 @@ const Routes: React.FC = () => {
           ) : hasToken && tokenVerifyLoading ? (
             <LoginLoading />
           ) : (
-            <Auth />
+            <Auth hasToken={hasToken} />
           )
         }
       </AuthProvider>