diff --git a/ui/src/Logout.tsx b/ui/src/Logout.tsx
index c2d89729e2..c53d38d966 100644
--- a/ui/src/Logout.tsx
+++ b/ui/src/Logout.tsx
@@ -22,7 +22,14 @@ export class Logout extends PureComponent<Props> {
 
   private handleSignOut = async () => {
     await logout()
-    this.props.router.push('/')
+    const {query} = this.props.location
+    let returnTo = ''
+
+    if (query && query.returnTo) {
+      returnTo = `?returnTo=${query.returnTo}`
+    }
+
+    this.props.router.push(`/signin${returnTo}`)
   }
 }
 
diff --git a/ui/src/Signin.tsx b/ui/src/Signin.tsx
index 4614039ac9..d4345797ee 100644
--- a/ui/src/Signin.tsx
+++ b/ui/src/Signin.tsx
@@ -62,8 +62,22 @@ export class Signin extends PureComponent<Props, State> {
     try {
       await getMe()
     } catch (error) {
+      const {
+        location: {pathname},
+      } = this.props
       clearInterval(this.intervalID)
-      this.props.router.push('/signin')
+
+      if (pathname.startsWith('/signin')) {
+        return
+      }
+
+      let returnTo = ''
+
+      if (pathname !== '/') {
+        returnTo = `?returnTo=${pathname}`
+      }
+
+      this.props.router.push(`/signin${returnTo}`)
     }
   }
 }
diff --git a/ui/src/me/components/LogoutButton.tsx b/ui/src/me/components/LogoutButton.tsx
index 7d9cbddff8..14ed239245 100644
--- a/ui/src/me/components/LogoutButton.tsx
+++ b/ui/src/me/components/LogoutButton.tsx
@@ -1,14 +1,15 @@
 // Libraries
 import React, {SFC} from 'react'
 import {Link} from 'react-router'
+import {withRouter, WithRouterProps} from 'react-router'
 
 // Components
 import {Button, ComponentSize} from 'src/clockface'
 
-const LogoutButton: SFC = () => (
-  <Link to={`/logout`}>
+const LogoutButton: SFC<WithRouterProps> = props => (
+  <Link to={`/logout?returnTo=${props.location.pathname}`}>
     <Button text="Logout" size={ComponentSize.ExtraSmall} />
   </Link>
 )
 
-export default LogoutButton
+export default withRouter<{}>(LogoutButton)
diff --git a/ui/src/onboarding/components/SigninForm.tsx b/ui/src/onboarding/components/SigninForm.tsx
index ac1a6223b1..e134302e25 100644
--- a/ui/src/onboarding/components/SigninForm.tsx
+++ b/ui/src/onboarding/components/SigninForm.tsx
@@ -103,12 +103,12 @@ class SigninForm extends PureComponent<Props, State> {
   }
 
   private handleSignIn = async (): Promise<void> => {
-    const {notify, router} = this.props
+    const {notify} = this.props
     const {username, password} = this.state
 
     try {
       await signin({username, password})
-      router.push('/dashboards')
+      this.handleRedirect()
     } catch (error) {
       const message = get(error, 'data.msg', '')
 
@@ -119,6 +119,17 @@ class SigninForm extends PureComponent<Props, State> {
       notify({...copy.SigninError, message})
     }
   }
+
+  private handleRedirect() {
+    const {router} = this.props
+    const {query} = this.props.location
+
+    if (query && query.returnTo) {
+      router.push(query.returnTo)
+    } else {
+      router.push('/me')
+    }
+  }
 }
 
 const mstp = ({links}) => ({
diff --git a/ui/src/onboarding/containers/OnboardingWizard.tsx b/ui/src/onboarding/containers/OnboardingWizard.tsx
index cba99f14f8..58cec2278b 100644
--- a/ui/src/onboarding/containers/OnboardingWizard.tsx
+++ b/ui/src/onboarding/containers/OnboardingWizard.tsx
@@ -122,7 +122,7 @@ class OnboardingWizard extends PureComponent<Props> {
   private handleExit = () => {
     const {router, onCompleteSetup} = this.props
     onCompleteSetup()
-    router.push(`/`)
+    router.push(`/me`)
   }
 
   private get onboardingStepProps(): OnboardingStepProps {
diff --git a/ui/src/onboarding/containers/SigninPage.tsx b/ui/src/onboarding/containers/SigninPage.tsx
index 7a7d4c5946..43870944e6 100644
--- a/ui/src/onboarding/containers/SigninPage.tsx
+++ b/ui/src/onboarding/containers/SigninPage.tsx
@@ -12,6 +12,7 @@ import SplashPage from 'src/shared/components/splash_page/SplashPage'
 import SigninForm from 'src/onboarding/components/SigninForm'
 import {Spinner} from 'src/clockface'
 import {RemoteDataState} from 'src/types'
+import Notifications from 'src/shared/components/notifications/Notifications'
 
 interface State {
   status: RemoteDataState
@@ -39,6 +40,7 @@ class SigninPage extends PureComponent<WithRouterProps, State> {
   public render() {
     return (
       <Spinner loading={this.state.status}>
+        <Notifications inPresentationMode={true} />
         <SplashPage panelWidthPixels={300}>
           <SplashPage.Panel>
             <SplashPage.Logo />
diff --git a/ui/src/pageLayout/containers/Nav.tsx b/ui/src/pageLayout/containers/Nav.tsx
index eae2df3474..d294a1828f 100644
--- a/ui/src/pageLayout/containers/Nav.tsx
+++ b/ui/src/pageLayout/containers/Nav.tsx
@@ -32,7 +32,7 @@ class SideNav extends PureComponent<Props> {
 
   public render() {
     const {isHidden, me} = this.props
-
+    const {location} = this.props
     if (isHidden) {
       return null
     }
@@ -48,7 +48,7 @@ class SideNav extends PureComponent<Props> {
         >
           <NavMenu.SubItem
             title="Logout"
-            link="/logout"
+            link={`/logout?returnTo=${location.pathname}`}
             location={location.pathname}
             highlightWhen={[]}
           />