diff --git a/src/invidious/helpers.cr b/src/invidious/helpers.cr
index 058237649..105a15987 100644
--- a/src/invidious/helpers.cr
+++ b/src/invidious/helpers.cr
@@ -997,8 +997,8 @@ def generate_captcha(key)
   challenge = ""
   convert = Process.run(%(convert -density 1200 -resize 400x400 -background none svg:- png:-), shell: true, input: IO::Memory.new(clock_svg), output: Process::Redirect::Pipe) do |proc|
     challenge = proc.output.gets_to_end
-    challenge = Base64.encode(challenge)
-    challenge = "data:image/png; base64, #{challenge}"
+    challenge = Base64.strict_encode(challenge)
+    challenge = "data:image/png;base64,#{challenge}"
   end
 
   answer = "#{hour}:#{minute.to_s.rjust(2, '0')}"
diff --git a/src/invidious/views/login.ecr b/src/invidious/views/login.ecr
index b927e69a8..1a2d826df 100644
--- a/src/invidious/views/login.ecr
+++ b/src/invidious/views/login.ecr
@@ -41,7 +41,7 @@
                     <label for="password">Password</label>
                     <input required class="pure-input-1" name="password" type="password" placeholder="Password">
                 
-                    <img src='<%= captcha.not_nil![:challenge] %>'/>
+                    <img style="width:100%" src='<%= captcha.not_nil![:challenge] %>'/>
                     <input type="hidden" name="token" value="<%= captcha.not_nil![:token] %>">
                     <label for="challenge_response">Time (hh:mm):</label>
                     <input required type="text" name="challenge_response" type="text>" placeholder="hh:mm">