diff --git a/winixd/html/fun_passwd.html b/winixd/html/fun_passwd.html
index c79ca14..621022d 100644
--- a/winixd/html/fun_passwd.html
+++ b/winixd/html/fun_passwd.html
@@ -5,63 +5,92 @@
 
 [if winix_function_param_is "resetpassword"]
 
-	<form id="additem" method="post" action="[doc_base_url][dir]passwd/resetpassword">
-	<fieldset>
-		<legend>{passwd_form_legend}</legend>
-		
-		<input type="hidden" name="login" value="[passwd_resetpass_login]">
-		<input type="hidden" name="code" value="[passwd_resetpass_code]">
-		
-		<p class="withnext">{passwd_new_password}:</p>
-		<input class="edit" type="password" name="passwordnew" value="">
+	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]passwd/resetpassword">
 
-		<p class="withnext">{passwd_confirm_new_password}:</p>
-		<input class="edit" type="password" name="passwordconfirm" value="">
+		<div class="uk-margin">
+			<input type="hidden" name="login" value="[passwd_resetpass_login]">
+			<input type="hidden" name="code" value="[passwd_resetpass_code]">
 
-		<input class="submit" type="submit" value="{passwd_submit}">
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_password_new">{passwd_new_password}</label>
 
-		[if winix_function_param_is "postredirect"]
-			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
-		[end]
+				<div class="uk-form-controls">
+					<input class="uk-input" id="winix_password_new" type="password" name="passwordnew" value="">
+				</div>
+			</div>
 
-	</fieldset>
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_password_confirm">{passwd_confirm_new_password}</label>
+
+				<div class="uk-form-controls">
+					<input class="uk-input" id="winix_password_confirm" type="password" name="passwordconfirm" value="">
+				</div>
+			</div>
+
+			<div class="uk-margin">
+				<div class="uk-form-controls">
+					<input class="uk-button uk-button-primary" type="submit" value="{passwd_submit}">
+				</div>
+			</div>
+
+			[if winix_function_param_is "postredirect"]
+				<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
+			[end]
+
+		</div>
 	</form>
 
 [else]
 
-	<form method="post" action="[doc_base_url][dir]passwd">
+	<form class="uk-form-stacked" method="post" action="[doc_base_url][dir]passwd">
 
 		[if user_super_user]
-			<div class="winix_input_a">
-				<label for="winix_users_id">{passwd_login}:</label>
-				<select name="login" id="winix_users_id">
-				[for user_tab]
-					<option [if user_tab_is_current]selected[end]>[user_tab_name]</option>
-				[end]
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_user_login">{passwd_login}</label>
+
+				<div class="uk-form-controls">
+					<select class="uk-select" id="winix_user_login" name="login">
+					[for user_tab]
+						<option [if user_tab_is_current]selected[end]>[user_tab_name]</option>
+					[end]
+					</select>
+				</div>
 			</div>
-		</select>
 		[else]
-			<div class="winix_input_a">
-				<label for="winix_current_pass_id">{passwd_current_password}:</label>
-				<input id="winix_current_pass_id" type="password" name="passwordcur" value="">
+			<div class="uk-margin">
+				<label class="uk-form-label" for="winix_current_password">{passwd_current_password}:</label>
+
+				<div class="uk-form-controls">
+					<input class="uk-input" id="winix_current_password" type="password" name="passwordcur" value="">
+				</div>
 			</div>
 		[end]
 		
-		<div class="winix_input_a">
-			<label for="winix_pass_new_id">{passwd_new_password}:</label>
-			<input id="winix_pass_new_id" type="password" name="passwordnew" value="">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_new_password">{passwd_new_password}:</label>
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_new_password" type="password" name="passwordnew" value="">
+			</div>
 		</div>
 
-		<div class="winix_input_a">
-			<label for="winix_pass_new_confirm_id">{passwd_confirm_new_password}:</label>
-			<input id="winix_pass_new_confirm_id" type="password" name="passwordconfirm" value="">
+		<div class="uk-margin">
+			<label class="uk-form-label" for="winix_new_password_confirm">{passwd_confirm_new_password}:</label>
+
+			<div class="uk-form-controls">
+				<input class="uk-input" id="winix_new_password_confirm" type="password" name="passwordconfirm" value="">
+			</div>
 		</div>
 
 		[if winix_function_param_is "postredirect"]
 			<input type="hidden" name="postredirect" value="[winix_function_param_value "postredirect"]">
 		[end]
 
-		<input type="submit" value="{passwd_submit}">
+		<div class="uk-margin">
+			<div class="uk-form-controls">
+				<input class="uk-button uk-button-primary" type="submit" value="{passwd_submit}">
+			</div>
+		</div>
 
 	</form>