diff --git a/backend/app/email.py b/backend/app/email.py
index d5db7f4..0e5723a 100644
--- a/backend/app/email.py
+++ b/backend/app/email.py
@@ -11,7 +11,9 @@ def send_email(subject, sender, recipients, text_body, html_body):
     msg = Message(subject, sender=sender, recipients=recipients)
     msg.body = text_body
     msg.html = html_body
-    Thread(target=send_async_email, args=(app, msg)).start()
+    mail.send(msg)
+    # Thread works surprisingly badly behind uwsgi, just let a uwsgi worker do its thing instead.
+    #Thread(target=send_async_email, args=(app, msg)).start()
 
 def send_password_reset_email(user):
     token = user.get_reset_password_token()
diff --git a/backend/app/templates/login.html b/backend/app/templates/login.html
index 9bb8d2d..4f2c3c4 100644
--- a/backend/app/templates/login.html
+++ b/backend/app/templates/login.html
@@ -19,10 +19,12 @@
 			{% endfor %}
 		</p>
 		<p>{{ form.remember_me() }} {{ form.remember_me.label }}</p>
-		<p>{{ form.submit }}</p>
+		<p>
+		{{ form.submit }}
+		<a class="button" href="{{ url_for('register') }}">Register</a>
+		</p>
 	</form>
 
-	<p><a href="{{ url_for('register') }}">Register Here</a></p>
 	<p><a href="{{ url_for('reset_password_request') }}">Reset Password</a></p>