diff --git a/lib/weblib.php b/lib/weblib.php
index c1eea0abb83..3e171f08629 100644
--- a/lib/weblib.php
+++ b/lib/weblib.php
@@ -395,7 +395,7 @@ function choose_from_menu ($options, $name, $selected="", $nothing="choose", $sc
     if ($nothing) {
         $output .= "   <option value=\"$nothingvalue\"\n";
         if ($nothingvalue === $selected) {
-            $output .= " selected=\"true\"";
+            $output .= " selected=\"selected\"";
         }
         $output .= ">$nothing</option>\n";
     }
@@ -403,7 +403,7 @@ function choose_from_menu ($options, $name, $selected="", $nothing="choose", $sc
         foreach ($options as $value => $label) {
             $output .= "   <option value=\"$value\"";
             if ($value == $selected) {
-                $output .= " selected=\"true\"";
+                $output .= " selected=\"selected\"";
             }
             if ($label === "") {
                 $output .= ">$value</option>\n";
diff --git a/user/edit.html b/user/edit.html
index 6a217b33146..0600653cb4a 100644
--- a/user/edit.html
+++ b/user/edit.html
@@ -22,31 +22,31 @@ if (isadmin()) {
     if ($adminself || is_internal_auth($user->auth) ){
         echo "<td><input type=\"text\" name=\"username\" size=\"20\" value=\"";
         p($user->username);
-        echo "\"/>";
+        echo "\" />";
         if (isset($err["username"])) formerr($err["username"]);
     } else {
         echo "<td>";
         p($user->username);
         echo "<input type=\"hidden\" name=\"username\" value=\"";
         p($user->username);
-        echo "\"/>";
+        echo "\" />";
     }
     echo "</td>";
-    echo "</tr>";
+    echo "</tr>\n";
 
     if ($adminself || is_internal_auth($user->auth) ){
         echo "<tr valign=\"top\">";
         echo "<td align=\"right\"><p>".get_string("newpassword").":</p></td>";
         echo "<td><input type=\"text\" name=\"newpassword\" size=\"20\" value=\"";
         if (isset($user->newpassword)) p($user->newpassword);
-            echo "\"/>";
+            echo "\" />";
         if (isset($err["newpassword"])) {
             formerr($err["newpassword"]);
         } else if (empty($user->newpassword)) {
             echo " (".get_string("leavetokeep").")";
         }
         echo "</td>";
-        echo "</tr>";
+        echo "</tr>\n";
         echo "<tr><td colspan=\"2\"><hr /></td></tr>";
     }
 }
diff --git a/user/edit.php b/user/edit.php
index 8040edf635b..3f77e01dfed 100644
--- a/user/edit.php
+++ b/user/edit.php
@@ -147,14 +147,14 @@
             print_header("$course->shortname: $streditmyprofile", "$course->fullname: $streditmyprofile",
                         "<a href=\"$CFG->wwwroot/course/view.php?id=$course->id\">$course->shortname</a> 
                         -> <a href=\"index.php?id=$course->id\">$strparticipants</a>
-                        -> <a href=\"view.php?id=$user->id&course=$course->id\">$userfullname</a> 
+                        -> <a href=\"view.php?id=$user->id&amp;course=$course->id\">$userfullname</a> 
                         -> $streditmyprofile", "");
         } else {
             if (isset($USER->newadminuser)) {
                 print_header();
             } else {
                 print_header("$course->shortname: $streditmyprofile", "$course->fullname",
-                             "<a href=\"view.php?id=$user->id&course=$course->id\">$userfullname</a> 
+                             "<a href=\"view.php?id=$user->id&amp;course=$course->id\">$userfullname</a> 
                               -> $streditmyprofile", "");
             }
         }