--- main.php.0	2005-01-03 15:34:49.000000000 +0100
+++ main.php	2005-07-07 03:58:46.897859208 +0200
@@ -35,10 +35,14 @@
         $forwardmode = 'error';
     }
 
-    $oldpassword = Util::getFormData('oldpassword', false);
-    if ($conf['enabled']['authenticate'] && !$oldpassword) {
-        $notification->push(_("You must give your password"), 'horde.warning');
-        $forwardmode = 'error';
+    if ($conf['enabled']['authenticate']) {
+	$oldpassword = Util::getFormData('oldpassword', false);
+	if (!$oldpassword) {
+    	    $notification->push(_("You must give your password"), 'horde.warning');
+    	    $forwardmode = 'error';
+	}
+    } else {
+	$oldpassword=Auth::getCredential('password');
     }
 
     $metoo = Util::getFormData('metoo', false);
