diff --git a/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua b/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua
index 20929036d7..940f09873b 100644
--- a/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua
+++ b/applications/luci-app-uhttpd/luasrc/model/cbi/uhttpd/uhttpd.lua
@@ -218,13 +218,15 @@ o.datatype = "min(1024)"
 o = s:option(Value, "commonname", translate("Server Hostname"), translate("a.k.a CommonName"))
 o.default = luci.sys.hostname()
 
-o = s:option(Value, "country", translate("Country"))
-o.default = "ZZ"
-
-o = s:option(Value, "state", translate("State"))
-o.default = "Unknown"
+o = s:option(Value, "organization", translate("Organization"), translate("If empty, a random/unique value is used in cert generation"))
 
 o = s:option(Value, "location", translate("Location"))
 o.default = "Unknown"
 
+o = s:option(Value, "state", translate("State"))
+o.default = "Unknown"
+
+o = s:option(Value, "country", translate("Country"))
+o.default = "ZZ"
+
 return m