diff --git a/src/invidious/routes/login.cr b/src/invidious/routes/login.cr
index 6eaf3071..1a243408 100644
--- a/src/invidious/routes/login.cr
+++ b/src/invidious/routes/login.cr
@@ -14,22 +14,9 @@ module Invidious::Routes::Login
       return error_template(400, "Login has been disabled by administrator.")
     end
 
-    email = nil
-    password = nil
-    captcha = nil
-
-    account_type = env.params.query["type"]?
-    account_type ||= "invidious"
-
-    captcha_type = env.params.query["captcha"]?
-    captcha_type ||= "image"
-
     templated "user/login"
   end
 
-  def self.signup_page(env)
-  end
-
   def self.login(env)
     locale = env.get("preferences").as(Preferences).locale
 
@@ -84,6 +71,32 @@ module Invidious::Routes::Login
     end
   end
 
+  def self.signup_page(env)
+    locale = env.get("preferences").as(Preferences).locale
+
+    user = env.get? "user"
+
+    referer = get_referer(env, "/feed/subscriptions")
+
+    return env.redirect referer if user
+
+    if !CONFIG.registration_enabled
+      return error_template(400, "Registration has been disabled by administrator.")
+    end
+
+    email = nil
+    password = nil
+    captcha = nil
+
+    account_type = env.params.query["type"]?
+    account_type ||= "invidious"
+
+    captcha_type = env.params.query["captcha"]?
+    captcha_type ||= "image"
+
+    templated "user/register"
+  end
+
   def self.signup(env)
     locale = env.get("preferences").as(Preferences).locale
     referer = get_referer(env, "/feed/subscriptions")
@@ -95,14 +108,14 @@ module Invidious::Routes::Login
     email = env.params.body["email"]?.try &.downcase.byte_slice(0, 254)
     password = env.params.body["password"]?
 
-    if password.nil? || password.empty?
-      return error_template(401, "Password cannot be empty")
-    end
-
     if email.nil? || email.empty?
       return error_template(401, "User ID is a required field")
     end
 
+    if password.nil? || password.empty?
+      return error_template(401, "Password cannot be empty")
+    end
+
     # See https://security.stackexchange.com/a/39851
     if password.bytesize > 55
       return error_template(400, "Password cannot be longer than 55 characters")
@@ -129,14 +142,13 @@ module Invidious::Routes::Login
           captcha = Invidious::User::Captcha.generate_text(HMAC_KEY)
         end
 
-        return templated "user/login"
+        return templated "user/register"
       end
 
       tokens = env.params.body.select { |k, _| k.match(/^token\[\d+\]$/) }.map { |_, v| v }
 
       answer ||= ""
       captcha_type ||= "image"
-
       case captcha_type
       when "image"
         answer = answer.lstrip('0')
diff --git a/src/invidious/routing.cr b/src/invidious/routing.cr
index 9ba67411..2aca8c78 100644
--- a/src/invidious/routing.cr
+++ b/src/invidious/routing.cr
@@ -55,8 +55,11 @@ module Invidious::Routing
   def register_user_routes
     # User login/out
     get "/login", Routes::Login, :login_page
-    get "/signup", Routes::Login, :signup_page
     post "/login", Routes::Login, :login
+
+    get "/signup", Routes::Login, :signup_page
+    post "/signup", Routes::Login, :signup
+
     post "/signout", Routes::Login, :signout
 
     # User preferences
diff --git a/src/invidious/views/user/login.ecr b/src/invidious/views/user/login.ecr
index 078eaa5c..79c4a16b 100644
--- a/src/invidious/views/user/login.ecr
+++ b/src/invidious/views/user/login.ecr
@@ -7,75 +7,23 @@
     <div class="pure-u-1 pure-u-lg-1-5"></div>
     <div class="pure-u-1 pure-u-lg-3-5">
         <div class="h-box">
-            <% case account_type when %>
-            <% else # "invidious" %>
-                <form class="pure-form pure-form-stacked" action="/login?referer=<%= URI.encode_www_form(referer) %>&type=invidious" method="post">
-                    <fieldset>
-                        <% if email %>
-                            <input name="email" type="hidden" value="<%= HTML.escape(email) %>">
-                        <% else %>
-                            <label for="email"><%= translate(locale, "User ID") %> :</label>
-                            <input required class="pure-input-1" name="email" type="text" placeholder="<%= translate(locale, "User ID") %>">
-                        <% end %>
+            <form class="pure-form pure-form-stacked" action="/login?referer=<%= URI.encode_www_form(referer) %>&type=invidious" method="post">
+                <fieldset>
+                    <label for="email"><%= translate(locale, "User ID") %> :</label>
+                    <input required class="pure-input-1" name="email" type="text" placeholder="<%= translate(locale, "User ID") %>">
 
-                        <% if password %>
-                            <input name="password" type="hidden" value="<%= HTML.escape(password) %>">
-                        <% else %>
-                            <label for="password"><%= translate(locale, "Password") %> :</label>
-                            <input required class="pure-input-1" name="password" type="password" placeholder="<%= translate(locale, "Password") %>">
-                        <% end %>
+                    <label for="password"><%= translate(locale, "Password") %> :</label>
+                    <input required class="pure-input-1" name="password" type="password" placeholder="<%= translate(locale, "Password") %>">
 
-                        <% if captcha %>
-                            <% case captcha_type when %>
-                            <% when "image" %>
-                                <% captcha = captcha.not_nil! %>
-                                <img style="width:50%" src='<%= captcha[:question] %>'/>
-                                <% captcha[:tokens].each_with_index do |token, i| %>
-                                    <input type="hidden" name="token[<%= i %>]" value="<%= HTML.escape(token) %>">
-                                <% end %>
-                                <input type="hidden" name="captcha_type" value="image">
-                                <label for="answer"><%= translate(locale, "Time (h:mm:ss):") %></label>
-                                <input type="text" name="answer" type="text" placeholder="h:mm:ss">
-                            <% else # "text" %>
-                                <% captcha = captcha.not_nil! %>
-                                <% captcha[:tokens].each_with_index do |token, i| %>
-                                    <input type="hidden" name="token[<%= i %>]" value="<%= HTML.escape(token) %>">
-                                <% end %>
-                                <input type="hidden" name="captcha_type" value="text">
-                                <label for="answer"><%= captcha[:question] %></label>
-                                <input type="text" name="answer" type="text" placeholder="<%= translate(locale, "Answer") %>">
-                            <% end %>
+                    <div class="account-page-action-bar">
+                        <a href="/signup" id="signup-link"><%= translate(locale, ("Create an account")) %> </a>
 
-                            <button type="submit" name="action" value="signin" class="pure-button pure-button-primary">
-                                <%= translate(locale, "Register") %>
-                            </button>
-
-                            <% case captcha_type when %>
-                            <% when "image" %>
-                                <label>
-                                    <button type="submit" name="change_type" class="pure-button pure-button-primary" value="text">
-                                        <%= translate(locale, "Text CAPTCHA") %>
-                                    </button>
-                                </label>
-                            <% else # "text" %>
-                                <label>
-                                    <button type="submit" name="change_type" class="pure-button pure-button-primary" value="image">
-                                        <%= translate(locale, "Image CAPTCHA") %>
-                                    </button>
-                                </label>
-                            <% end %>
-                        <% else %>
-                            <div class="account-page-action-bar">
-                                <a href="/signup" id="signup-link"><%= translate(locale, ("Create an account")) %> </a>
-
-                                <button type="submit" name="action" value="signin" class="pure-button pure-button-primary" id="signin-button">
-                                    <%= translate(locale, "Sign In") %>
-                                </button>
-                            </div>
-                        <% end %>
-                    </fieldset>
-                </form>
-            <% end %>
+                        <button type="submit" name="action" value="signin" class="pure-button pure-button-primary" id="signin-button">
+                            <%= translate(locale, "Sign In") %>
+                        </button>
+                    </div>
+                </fieldset>
+            </form>
         </div>
     </div>
     <div class="pure-u-1 pure-u-lg-1-5"></div>
diff --git a/src/invidious/views/user/register.ecr b/src/invidious/views/user/register.ecr
new file mode 100644
index 00000000..61179369
--- /dev/null
+++ b/src/invidious/views/user/register.ecr
@@ -0,0 +1,77 @@
+<% content_for "header" do %>
+<title><%= translate(locale, "sign_up_page_title") %> - Invidious</title>
+<link rel="stylesheet" href="/css/signin-signout.css?v=<%= ASSET_COMMIT %>">
+<% end %>
+
+<div class="pure-g">
+    <div class="pure-u-1 pure-u-lg-1-5"></div>
+    <div class="pure-u-1 pure-u-lg-3-5">
+        <div class="h-box">
+            <form class="pure-form pure-form-stacked" action="/signup?referer=<%= URI.encode_www_form(referer) %>&type=invidious" method="post">
+                <fieldset>
+                    <% if email %>
+                        <input name="email" type="hidden" value="<%= HTML.escape(email) %>">
+                    <% else %>
+                        <label for="email"><%= translate(locale, "User ID") %> :</label>
+                        <input required class="pure-input-1" name="email" type="text" placeholder="<%= translate(locale, "User ID") %>">
+                    <% end %>
+
+                    <% if password %>
+                        <input name="password" type="hidden" value="<%= HTML.escape(password) %>">
+                    <% else %>
+                        <label for="password"><%= translate(locale, "Password") %> :</label>
+                        <input required class="pure-input-1" name="password" type="password" placeholder="<%= translate(locale, "Password") %>">
+                    <% end %>
+
+                    <% if captcha %>
+                        <% case captcha_type when %>
+                        <% when "image" %>
+                            <% captcha = captcha.not_nil! %>
+                            <img style="width:50%" src='<%= captcha[:question] %>'/>
+                            <% captcha[:tokens].each_with_index do |token, i| %>
+                                <input type="hidden" name="token[<%= i %>]" value="<%= HTML.escape(token) %>">
+                            <% end %>
+                            <input type="hidden" name="captcha_type" value="image">
+                            <label for="answer"><%= translate(locale, "Time (h:mm:ss):") %></label>
+                            <input type="text" name="answer" type="text" placeholder="h:mm:ss">
+                        <% else # "text" %>
+                            <% captcha = captcha.not_nil! %>
+                            <% captcha[:tokens].each_with_index do |token, i| %>
+                                <input type="hidden" name="token[<%= i %>]" value="<%= HTML.escape(token) %>">
+                            <% end %>
+                            <input type="hidden" name="captcha_type" value="text">
+                            <label for="answer"><%= captcha[:question] %></label>
+                            <input type="text" name="answer" type="text" placeholder="<%= translate(locale, "Answer") %>">
+                        <% end %>
+
+                        <button type="submit" name="action" value="signup" class="pure-button pure-button-primary">
+                            <%= translate(locale, "Sign Up") %>
+                        </button>
+
+                        <% case captcha_type when %>
+                        <% when "image" %>
+                            <label>
+                                <button type="submit" name="change_type" class="pure-button pure-button-primary" value="text">
+                                    <%= translate(locale, "Text CAPTCHA") %>
+                                </button>
+                            </label>
+                        <% else # "text" %>
+                            <label>
+                                <button type="submit" name="change_type" class="pure-button pure-button-primary" value="image">
+                                    <%= translate(locale, "Image CAPTCHA") %>
+                                </button>
+                            </label>
+                        <% end %>
+                    <% else %>
+                        <div class="account-page-action-bar">
+                            <button type="submit" name="action" value="signup" class="pure-button pure-button-primary" id="signup-button">
+                                <%= translate(locale, "Sign Up") %>
+                            </button>
+                        </div>
+                    <% end %>
+                </fieldset>
+            </form>
+        </div>
+    </div>
+    <div class="pure-u-1 pure-u-lg-1-5"></div>
+</div>