Index: Slim/Web/Settings/Server/Security.pm
===================================================================
--- Slim/Web/Settings/Server/Security.pm	(revision 21709)
+++ Slim/Web/Settings/Server/Security.pm	(working copy)
@@ -29,6 +29,11 @@
 sub handler {
 	my ($class, $client, $paramRef, $pageSetup) = @_;
 
+	if ($paramRef->{'pref_password'} ne $paramRef->{'pref_password_repeat'}) {
+		$paramRef->{'warning'} .= sprintf(Slim::Utils::Strings::string('SETTINGS_INVALIDVALUE'), '....', Slim::Utils::Strings::string('SETUP_PASSWORD')) . '<br/>';
+		return $class->SUPER::handler($client, $paramRef, $pageSetup);
+	}
+
 	# disable authorization if no username is set
 	$paramRef->{'authorize'} = 0 unless $paramRef->{'username'};
 
Index: HTML/EN/settings/server/security.html
===================================================================
--- HTML/EN/settings/server/security.html	(revision 21709)
+++ HTML/EN/settings/server/security.html	(working copy)
@@ -17,6 +17,10 @@
 		[% WRAPPER settingGroup title="SETUP_PASSWORD" desc="" %]
 			<input type="password" class="stdedit" name="pref_password" id="password" value="[% prefs.pref_password %]" size="40">
 		[% END %]
+
+		[% WRAPPER settingGroup title="SETUP_PASSWORD_REPEAT" desc="" %]
+			<input type="password" class="stdedit" name="pref_password_repeat" id="password" value="[% prefs.pref_password %]" size="40">
+		[% END %]
 	[% END %]
 
 	[% WRAPPER settingSection %]
Index: strings.txt
===================================================================
--- strings.txt	(revision 21709)
+++ strings.txt	(working copy)
@@ -6872,6 +6872,10 @@
 	SV	Lösenord
 	ZH_CN	密码
 
+SETUP_PASSWORD_REPEAT
+	DE	Kennwort (wiederholen)
+	EN	Password (repeat)
+
 SETUP_DONT_CACHE
 	CS	Necachovat
 	DA	Cache ikke