diff -k.orig -Naur wacko.orig/actions/usersettings.php wacko/actions/usersettings.php
--- wacko.orig/actions/usersettings.php	2003-06-06 03:09:46 +0400
+++ wacko/actions/usersettings.php	2004-01-11 15:46:36 +0300
@@ -12,10 +12,29 @@
   // is user trying to update?
   if ($_REQUEST["action"] == "update")
   {
-    $bookmarks = str_replace("\r", "", $_POST["bookmarks"]);
+    $email = trim($_POST["email"]);
+    $password = $_POST["password"];
+    $newpassword = $_POST["newpassword"];
+    $confnewpassword = $_POST["confnewpassword"];
+    $passwordupdate_str = "";
 
-    $this->Query("update ".$this->config["table_prefix"]."users set ".
+    $existingUser = $this->LoadUser($user["name"]);
+
+    if (!$email) $error = $this->GetResourceValue("SpecifyEmail");
+    else if (!preg_match("/^.+?\@.+?\..+$/", $email)) $error = $this->GetResourceValue("NotAEmail");
+    else if ($confnewpassword != $newpassword) $error = $this->GetResourceValue("PasswordsDidntMatch");
+    else if (preg_match("/ /", $newpassword)) $error = $this->GetResourceValue("SpacesArentAllowed");
+    else if (($newpassword != "" ) && (strlen($newpassword) < 5) ) $error = $this->GetResourceValue("PasswordTooShort");
+    else if (($newpassword != "" ) && ($existingUser["password"] != md5($_POST["password"])) ) $error = $this->GetResourceValue("WrongPassword");
+    else
+    {
+      $bookmarks = str_replace("\r", "", $_POST["bookmarks"]);
+
+      if ($newpassword != "" ) $passwordupdate_str = "password = md5('".quote($_POST["newpassword"])."'), ";
+
+      $this->Query("update ".$this->config["table_prefix"]."users set ".
       "email = '".quote($_POST["email"])."', ".
+      "$passwordupdate_str".
       "doubleclickedit = '".quote($_POST["doubleclickedit"])."', ".
       "showdatetime = '".quote($_POST["showdatetimeinlinks"])."', ".
       "show_comments = '".quote($_POST["show_comments"])."', ".
@@ -27,13 +46,13 @@
       "typografica = '".quote($_POST["typografica"])."', ".
       "lang = '".quote($_POST["lang"])."' ".
       "where name = '".$user["name"]."' limit 1");
-    
-    $this->SetUser($this->LoadUser($user["name"]));
-    
-    // forward
-    $this->SetMessage($this->GetResourceValue("SettingsStored"));
 
-    $this->Redirect($this->href());
+      $this->SetUser($this->LoadUser($user["name"]));
+
+      // forward
+      $this->SetMessage($this->GetResourceValue("SettingsStored"));
+      $this->Redirect($this->href());
+    }
   }
   
   // user is logged in; display config form
@@ -45,6 +64,12 @@
       <td align="right"></td>
       <td><?php echo $this->GetResourceValue("Hello").", ".$this->ComposeLinkToPage($user["name"]) ?>!</td>
     </tr>
+    <?php
+    if ($error)
+    {
+      print("<tr><td colspan=\"2\" align=\"center\"><div class=\"error\">".$this->Format($error)."</div></td></tr>\n");
+    }
+    ?>
     <tr>
       <td align="right"><?php echo $this->GetResourceValue("YourEmail");?>:</td>
       <td><input name="email" value="<?php echo htmlentities($user["email"]) ?>" size="40" /></td>
@@ -100,6 +125,18 @@
       <td><textarea name="bookmarks" cols="40" rows="10"><?php echo htmlspecialchars($user["bookmarks"]) ?></textarea></td>
     </tr>
     <tr>
+      <td align="right"><?php echo $this->GetResourceValue("LoginPassword");?>:</td>
+      <td><input type="password" name="password" value="" size="24" /></td>
+    </tr>
+    <tr>
+      <td align="right"><?php echo $this->GetResourceValue("NewPassword");?>:</td>
+      <td><input type="password" name="newpassword" value="" size="24" /></td>
+    </tr>
+    <tr>
+      <td align="right"><?php echo $this->GetResourceValue("ConfirmNewPassword");?>:</td>
+      <td><input type="password" name="confnewpassword" value="" size="24" /></td>
+    </tr>
+    <tr>
       <td></td>
       <td>
           <input class="OkBtn" onmouseover='this.className="OkBtn_";' 
diff -k.orig -Naur wacko.orig/lang/wakka.de.php wacko/lang/wakka.de.php
--- wacko.orig/lang/wakka.de.php	2003-06-26 11:55:42 +0400
+++ wacko/lang/wakka.de.php	2004-01-11 15:53:43 +0300
@@ -161,6 +161,8 @@
   "ConfirmPassword" => "Passwort best&auml;tigen",
   "Email" => "Emailadresse",
   "MustBeWikiName" => "Benutzername muss im ((http://wiki.oversite.ru/wackodocumentation/WikiName WikiName))-Format sein!",
+  "NewPassword" => "New password (5+ chars)",
+  "ConfirmNewPassword" => "Confirm new password",
   "SpecifyEmail" => "Du musst eine Emailadresse angeben.",
   "NotAEmail" => "Das sieht nicht nach einer Emailadresse aus.",
   "PasswordsDidntMatch" => "Passw&ouml;rter stimmen nicht &uuml;berein.",
@@ -197,4 +199,5 @@
   "LinksRenamed"   =>"<em>Page links from %1 renamed.</em>",
 
 );
-?>
\ ч ЛПОГЕ ЖБКМБ ОЕФ ОПЧПК УФТПЛЙ
+?>
+
diff -k.orig -Naur wacko.orig/lang/wakka.en.php wacko/lang/wakka.en.php
--- wacko.orig/lang/wakka.en.php	2003-06-26 11:55:44 +0400
+++ wacko/lang/wakka.en.php	2004-01-11 15:53:48 +0300
@@ -161,6 +161,8 @@
   "ConfirmPassword" => "Confirm password",
   "Email" => "Email address",
   "MustBeWikiName" => "User name must be ((http://wiki.oversite.ru/wackodocumentation/WikiName WikiName)) formatted!",
+  "NewPassword" => "New password (5+ chars)",
+  "ConfirmNewPassword" => "Confirm new password",
   "SpecifyEmail" => "You must specify an email address.",
   "NotAEmail" => "That doesn't quite look like an email address.",
   "PasswordsDidntMatch" => "Passwords didn't match.",
@@ -199,3 +201,4 @@
 
 );
 ?>
+
diff -k.orig -Naur wacko.orig/lang/wakka.ru.php wacko/lang/wakka.ru.php
--- wacko.orig/lang/wakka.ru.php	2003-06-26 11:55:44 +0400
+++ wacko/lang/wakka.ru.php	2004-01-11 15:53:53 +0300
@@ -162,6 +162,8 @@
   "ConfirmPassword" => "Подтверждение пароля",
   "Email" => "Адрес электронной почты",
   "MustBeWikiName" => "Имя пользователя должно быть ((WackoWiki:WackoДокументация/ВикиИмя ВикиИменем)) ",
+  "NewPassword" => "Новый пароль (не менее 5 символов)",
+  "ConfirmNewPassword" => "Подтверждение нового пароля",
   "SpecifyEmail" => "Вы должны указать адрес электронной почты.",
   "NotAEmail" => "Это не похоже на адрес электронной почты.",
   "PasswordsDidntMatch" => "Пароли не совпадают.",
@@ -198,4 +200,5 @@
   "LinksRenamed"   =>"<em>Ссылки с %1 переименованы.</em>",
 );
 
-?>
\ ч ЛПОГЕ ЖБКМБ ОЕФ ОПЧПК УФТПЛЙ
+?>
+