diff --git a/packages/design-system/atoms/typography/typography.tsx b/packages/design-system/atoms/typography/typography.tsx
index b44354b..341f9a3 100644
--- a/packages/design-system/atoms/typography/typography.tsx
+++ b/packages/design-system/atoms/typography/typography.tsx
@@ -107,7 +107,7 @@ export const Link = styled.a`
   }
 `;
 
-export const CompletelyStylelessLink = styled(RouterLink)`
+export const CompletelyStylelessA = styled.a`
   color: inherit;
   text-decoration: none;
   :visited,
@@ -116,3 +116,5 @@ export const CompletelyStylelessLink = styled(RouterLink)`
     color: inherit;
   }
 `;
+
+export const CompletelyStylelessLink = CompletelyStylelessA.withComponent(RouterLink);
diff --git a/packages/design-system/organisms/preauth/Preauth.tsx b/packages/design-system/organisms/preauth/Preauth.tsx
index 9da395d..ca17aff 100644
--- a/packages/design-system/organisms/preauth/Preauth.tsx
+++ b/packages/design-system/organisms/preauth/Preauth.tsx
@@ -4,7 +4,7 @@ import { GuildSlug } from '@roleypoly/types';
 import * as React from 'react';
 import { FaDiscord } from 'react-icons/fa';
 import styled from 'styled-components';
-import { CompletelyStylelessLink } from '../../atoms/typography';
+import { CompletelyStylelessA } from '../../atoms/typography';
 
 export type PreauthProps = {
   guildSlug?: GuildSlug;
@@ -33,7 +33,7 @@ export const Preauth = (props: PreauthProps) => {
     <Centered>
       {props.guildSlug && <PreauthGreeting guildSlug={props.guildSlug} />}
       <WidthContainer>
-        <CompletelyStylelessLink to={props.discordOAuthLink || '#'}>
+        <CompletelyStylelessA href={props.discordOAuthLink || '#'}>
           <Button
             color="discord"
             icon={
@@ -44,7 +44,7 @@ export const Preauth = (props: PreauthProps) => {
           >
             Sign in with Discord
           </Button>
-        </CompletelyStylelessLink>
+        </CompletelyStylelessA>
       </WidthContainer>
     </Centered>
   );
diff --git a/packages/design-system/organisms/server-setup/ServerSetup.tsx b/packages/design-system/organisms/server-setup/ServerSetup.tsx
index b4c3754..788f119 100644
--- a/packages/design-system/organisms/server-setup/ServerSetup.tsx
+++ b/packages/design-system/organisms/server-setup/ServerSetup.tsx
@@ -1,3 +1,4 @@
+import { navigate } from '@reach/router';
 import { Avatar, utils } from '@roleypoly/design-system/atoms/avatar';
 import { Button } from '@roleypoly/design-system/atoms/button';
 import { DotOverlay } from '@roleypoly/design-system/atoms/dot-overlay';
@@ -61,7 +62,7 @@ const adminMessage = (id: string) => (
     </FlexLine>
     <FlexLine>
       <div>
-        <CompletelyStylelessLink to={`/machinery/bot-join?id=${id}`}>
+        <CompletelyStylelessLink to={`/machinery/bot-join/${id}`}>
           <Button color="discord" icon={<FaDiscord />}>
             Add Roleypoly
           </Button>
@@ -78,7 +79,7 @@ const managerMessage = (id: string) => (
     </FlexLine>
     <FlexLine>
       <div>
-        <a href={`/machinery/bot-join?id=${id}`}>
+        <a href={`/machinery/bot-join/${id}`}>
           <Button color="discord" icon={<FaDiscord />}>
             Add Roleypoly
           </Button>
@@ -99,7 +100,7 @@ const userMessage = (name: string) => {
       <FlexLine>
         <Button
           onClick={() => {
-            // void router.push('/');
+            navigate(-1);
           }}
           color="muted"
           size="small"