diff --git a/app.py b/app.py
index 109c4b8..1029e61 100644
--- a/app.py
+++ b/app.py
@@ -87,8 +87,9 @@ def get_aliases(username):
     while i < len(data):
         j=0
         while j < len(data[i]['aliases']):
-            if data[i]['aliases'][j]['forwards_to'][0] == username:
-                aliases.append(data[i]['aliases'][j]['address'])
+            if len(data[i]['aliases'][j]['forwards_to']) == 1:
+                if data[i]['aliases'][j]['forwards_to'][0] == username:
+                    aliases.append(data[i]['aliases'][j]['address'])
             j+=1
         i+=1
     return aliases
@@ -105,15 +106,7 @@ def home():
         # render homepage
         return template('default', username=username, app_name=app_name, message=message, aliases=aliases)
     else:
-        redirect('/login')
-
-@get('/login')
-@get('/login/')
-def login():
-    if logged_in():
-        redirect('/')
-    else:
-        #render login page
+        # render login
         message = request.get_cookie(cookie_name + "_message", secret=cookie_secret)
         return template('login', app_name=app_name, cookie_max_age=cookie_max_age, message=message)
 
@@ -127,7 +120,7 @@ def post_login():
         response.set_cookie(cookie_name + "_message", message, secret=cookie_secret, max_age=5)
         redirect('/')
     else:
-        redirect('/login')
+        redirect('/')
 
 # delete cookie
 @get('/logout')
@@ -171,7 +164,7 @@ def post_password():
             response.set_cookie(cookie_name + "_message", message, secret=cookie_secret, max_age=5)
             redirect('/')
     else:
-        redirect('/login')
+        redirect('/')
 
 
 #@post('/alias/add')
@@ -196,7 +189,7 @@ def delete_alias():
         response.set_cookie(cookie_name + "_message", message, secret=cookie_secret, max_age=5, path="/")
         redirect('/')
     else:
-        redirect('/login')
+        redirect('/')
 
 
 #@post('/delete')
diff --git a/views/login.tpl b/views/login.tpl
index 741c391..4cf2cca 100644
--- a/views/login.tpl
+++ b/views/login.tpl
@@ -29,7 +29,7 @@
         </div>
       %end
 
-      <form class="form-signin" action"/login" method="post">
+      <form class="form-signin" action="/login" method="post">
         <h2 class="form-signin-heading">SocialNerds Accounts<small>self-service login</small></h2>
         <label for="inputEmail" class="sr-only">Email address</label>
         <input name="username" type="email" id="inputEmail" class="form-control" placeholder="Email address" required autofocus>