diff --git a/inc/lib_user.php b/inc/lib_user.php
index 86ef53df669..e5d994dd02f 100755
--- a/inc/lib_user.php
+++ b/inc/lib_user.php
@@ -252,7 +252,7 @@ class OC_USER {
 	public static function setpassword($username,$password){
 		$password=sha1($password);
 		$userid=OC_USER::getuserid($username);
-		$query="UPDATE  users SET  user_password = '$password' WHERE  user_id =$userid LIMIT 1 ;";
+		$query="UPDATE  users SET  user_password = '$password' WHERE  user_id ='$userid'";
 		$result=OC_DB::query($query);
 		if($result){
 			return true;
diff --git a/inc/templates/configform.php b/inc/templates/configform.php
index f9abaad8966..709e8f14296 100755
--- a/inc/templates/configform.php
+++ b/inc/templates/configform.php
@@ -30,6 +30,7 @@ changepassset=function(){
 <tr><td>change password:</td><td><input onchange='changepassset()' id='changepass' type="checkbox" name="changepass" size="30" class="formstyle" value='1'></input></td></tr>
 <tr style='display:none' id='new_password'><td>new password:</td><td><input type="password" name="password" size="30" class="formstyle"></input></td></tr>
 <tr style='display:none' id='new_password_retype'><td>retype admin password:</td><td><input type="password" name="password2" size="30" class="formstyle"></input></td></tr>
+<tr><td></td><td><input type='submit' value='save' class='formstyle'/></td></tr>
 </table>
 </form>
 <!--dissabled for now