diff --git a/src/components/Setup/index.tsx b/src/components/Setup/index.tsx
index 9a4d363eb..fca2fea2f 100644
--- a/src/components/Setup/index.tsx
+++ b/src/components/Setup/index.tsx
@@ -63,7 +63,11 @@ const Setup: React.FC = () => {
         <LanguagePicker />
       </div>
       <div className="relative z-40 px-4 sm:mx-auto sm:w-full sm:max-w-4xl">
-        <img src="/logo.png" className="max-w-full sm:max-w-md" alt="Logo" />
+        <img
+          src="/logo.png"
+          className="max-w-full sm:max-w-md sm:mx-auto"
+          alt="Logo"
+        />
         <AppDataWarning />
         <nav className="relative z-50">
           <ul
diff --git a/src/pages/_app.tsx b/src/pages/_app.tsx
index 6c806e88a..5949aafbe 100644
--- a/src/pages/_app.tsx
+++ b/src/pages/_app.tsx
@@ -180,7 +180,7 @@ CoreApp.getInitialProps = async (initialProps) => {
         );
         user = response.data;
 
-        if (router.pathname.match(/login/)) {
+        if (router.pathname.match(/(setup|login)/)) {
           ctx.res.writeHead(307, {
             Location: '/',
           });