diff --git a/lib/PageRender.php b/lib/PageRender.php
index f858216..92205ec 100644
--- a/lib/PageRender.php
+++ b/lib/PageRender.php
@@ -236,7 +236,9 @@ class PageRender extends Visitor {
 					$enc = $_REQUEST[$matchall[1][0]][$passwordattr][$i];
 
 				} else
-					$enc = strtolower($args[0]);
+					$enc = $args[0];
+
+				$enc = strtolower($enc);
 
 				switch ($enc) {
 					case 'lm':
diff --git a/lib/SambaPasswordAttribute.php b/lib/SambaPasswordAttribute.php
index 04ce01e..a46e057 100644
--- a/lib/SambaPasswordAttribute.php
+++ b/lib/SambaPasswordAttribute.php
@@ -14,6 +14,6 @@
  * @package phpLDAPadmin
  * @subpackage Templates
  */
-class SambaPasswordAttribute extends Attribute {
+class SambaPasswordAttribute extends PasswordAttribute {
 }
 ?>
diff --git a/lib/TemplateRender.php b/lib/TemplateRender.php
index 0a3794e..caaab9f 100644
--- a/lib/TemplateRender.php
+++ b/lib/TemplateRender.php
@@ -2401,6 +2401,25 @@ function deleteAttribute(attrName,friendlyName,i)
 		echo '</select>';
 	}
 
+	protected function drawDefaultHelperSambaPasswordAttribute($attribute,$i) {
+		$id = 'enc';
+
+		if (! $attribute->getPostValue())
+			printf('<input type="hidden" name="post_value[%s][]" value="%s"/>',$attribute->getName(),$i);
+
+		switch ($attribute->getName()) {
+			case 'sambalmpassword' : $enc = 'lm'; break;
+			case 'sambantpassword' : $enc = 'nt'; break;
+
+			default:
+				return '';
+		}
+
+		printf('<input type="hidden" name="%s[%s][%s]" id="%s_%s_%s" value="%s">',
+			$id,htmlspecialchars($attribute->getName()),$i,
+			$id,htmlspecialchars($attribute->getName()),$i,$enc);
+	}
+
 	/** SELECTION ATTRIBUTE RENDERING **/
 
 	protected function drawIconSelectionAttribute($attribute,$val) {