diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2bf025342..db4d4b8f7 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -5,6 +5,7 @@ All notable changes to this project will be documented in this file.
 ### Added
 - Added screenshots to Readme.
 - repro: Open up RTP ports.
+- Allow modules to register steps for first_boot.
 
 ### Fixed
 - Upstream patch from Debian bug #837206 to fix DB and log file
diff --git a/plinth/modules/first_boot/templatetags/firstboot_extras.py b/plinth/modules/first_boot/templatetags/firstboot_extras.py
index 47c243e4f..eac4f7c07 100644
--- a/plinth/modules/first_boot/templatetags/firstboot_extras.py
+++ b/plinth/modules/first_boot/templatetags/firstboot_extras.py
@@ -29,5 +29,5 @@ register = template.Library()
 @register.simple_tag
 def firstboot_is_finished():
     """Return whether firstboot process is completed."""
-    state = kvstore.get_default('firstboot_state', 0)
-    return state >= 10
+    state = kvstore.get_default('setup_state', 0)
+    return state == 1