diff --git a/packages/client/src/login/LoginForm.tsx b/packages/client/src/login/LoginForm.tsx
index 1c1775a..0658e52 100644
--- a/packages/client/src/login/LoginForm.tsx
+++ b/packages/client/src/login/LoginForm.tsx
@@ -1,8 +1,9 @@
 import React from 'react'
+import {FaUser, FaLock} from 'react-icons/fa'
 import {ICredentials, IUser} from '@rondo/common'
 import {Input} from '../components/Input'
+import {Link} from 'react-router-dom'
 import {Redirect} from '../components/Redirect'
-import {FaUser, FaLock} from 'react-icons/fa'
 
 export interface ILoginFormProps {
   error?: string
@@ -47,6 +48,10 @@ export class LoginForm extends React.PureComponent<ILoginFormProps> {
           type='submit'
           value='Log In'
         />
+
+        <p>
+          Do not have an account? <Link to='/auth/register'>Register</Link>
+        </p>
       </form>
     )
   }
diff --git a/packages/client/src/renderer/ServerRenderer.tsx b/packages/client/src/renderer/ServerRenderer.tsx
index 21adffb..259a0a9 100644
--- a/packages/client/src/renderer/ServerRenderer.tsx
+++ b/packages/client/src/renderer/ServerRenderer.tsx
@@ -20,7 +20,11 @@ export class ServerRenderer<State, A extends Action> implements IRenderer {
     const context: StaticRouterContext = {}
     const stream = renderToNodeStream(
       <Provider store={store}>
-        <StaticRouter location={url} context={context} >
+        <StaticRouter
+          basename={config.baseUrl}
+          location={url}
+          context={context}
+        >
           <RootComponent config={config} />
         </StaticRouter>
       </Provider>,
diff --git a/packages/server/@types/express.d.ts b/packages/server/@types/express.d.ts
index 55bca2b..5083330 100644
--- a/packages/server/@types/express.d.ts
+++ b/packages/server/@types/express.d.ts
@@ -1,6 +1,9 @@
 declare namespace Application {
   export interface User {
     id: number
+    username: string
+    firstName: string
+    lastName: string
   }
 }
 
diff --git a/packages/server/src/middleware/RequestLogger.ts b/packages/server/src/middleware/RequestLogger.ts
index db11a47..98d3fcd 100644
--- a/packages/server/src/middleware/RequestLogger.ts
+++ b/packages/server/src/middleware/RequestLogger.ts
@@ -8,12 +8,14 @@ export class RequestLogger implements IMiddleware {
   handle: IHandler = (req, res, next) => {
     const start = Date.now()
     res.on('finish', () => {
-      const { method, originalUrl } = req
+      const { method, originalUrl, user } = req
+      const username = user ? user.username : ''
       const duration = Date.now() - start
-      this.logger.debug('%s %s %j', method, originalUrl, req.body)
+      this.logger.debug('%s %s [%s] %j',
+        method, originalUrl, username, req.body)
       const { statusCode } = res
-      this.logger.info('%s %s %d %sms',
-        method, originalUrl, statusCode, duration)
+      this.logger.info('%s %s [%s] %d %sms',
+        method, originalUrl, username, statusCode, duration)
     })
     next()
   }