diff --git a/Changelog.md b/Changelog.md
index 0b3f84b00..3c35d41a0 100644
--- a/Changelog.md
+++ b/Changelog.md
@@ -46,6 +46,10 @@ Ruby 2.0 is no longer officially supported.
 * Added link to diasporafoundation.org to invitation email [#5893](https://github.com/diaspora/diaspora/pull/5893)
 * Gracefully handle missing `og:url`s [#5926](https://github.com/diaspora/diaspora/pull/5926)
 
+# 0.5.0.1
+
+Use the correct setting for captcha length instead of defaulting to 1 always.
+
 # 0.5.0.0
 
 ## Major Sidekiq update
diff --git a/config/defaults.yml b/config/defaults.yml
index 2b7883626..4b5721864 100644
--- a/config/defaults.yml
+++ b/config/defaults.yml
@@ -4,7 +4,7 @@
 
 defaults:
   version:
-    number: "0.5.99.0" # Do not touch unless doing a release, do not backport the version number that's in master but keep develop to always say "head"
+    number: "0.5.99.0" # Do not touch unless doing a release, do not backport the version number that's in master
   heroku: false
   environment:
     url: "http://localhost:3000/"
diff --git a/config/initializers/setup_simple_captcha.rb b/config/initializers/setup_simple_captcha.rb
index cdcb6c2a0..a79b48d45 100644
--- a/config/initializers/setup_simple_captcha.rb
+++ b/config/initializers/setup_simple_captcha.rb
@@ -1,6 +1,6 @@
 SimpleCaptcha.setup do |sc|
   sc.image_size = AppConfig.settings.captcha.image_size
-  sc.length = [1, [AppConfig.settings.captcha_length.to_i, 12].min].max
+  sc.length = [1, [AppConfig.settings.captcha.captcha_length.to_i, 12].min].max
   sc.image_style = AppConfig.settings.captcha.image_style
   sc.distortion = AppConfig.settings.captcha.distortion
 end
diff --git a/spec/configuration_methods_spec.rb b/spec/configuration_methods_spec.rb
new file mode 100644
index 000000000..a0d4e5d8f
--- /dev/null
+++ b/spec/configuration_methods_spec.rb
@@ -0,0 +1,7 @@
+require "spec_helper"
+
+describe "ensure configuration effects" do
+  it "sets the captcha length as required" do
+    expect(SimpleCaptcha.length).to eq(AppConfig.settings.captcha.captcha_length.to_i)
+  end
+end