diff --git a/admin/roles/manage.php b/admin/roles/manage.php
index 8f22b848823..02c37ee3c40 100755
--- a/admin/roles/manage.php
+++ b/admin/roles/manage.php
@@ -382,18 +382,18 @@
             $row[0] = '<a href="manage.php?roleid='.$role->id.'&amp;action=view">'.format_string($role->name).'</a>';
             $row[1] = format_text($role->description, FORMAT_HTML);
             $row[2] = s($role->shortname);
-            $row[3] = '<a title="'.$stredit.'" href="manage.php?action=edit&roleid='.$role->id.'">'.
+            $row[3] = '<a title="'.$stredit.'" href="manage.php?action=edit&amp;roleid='.$role->id.'">'.
                          '<img src="'.$CFG->pixpath.'/t/edit.gif" height="11" width="11" border="0" alt="'.$stredit.'" /></a> ';
-            $row[3] .= '<a title="'.$strdelete.'" href="manage.php?action=delete&roleid='.$role->id.'&sesskey='.sesskey().'">'.
+            $row[3] .= '<a title="'.$strdelete.'" href="manage.php?action=delete&amp;roleid='.$role->id.'&amp;sesskey='.sesskey().'">'.
                          '<img src="'.$CFG->pixpath.'/t/delete.gif" height="11" width="11" border="0" alt="'.$strdelete.'" /></a> ';
             if ($role->sortorder != 0) {
-                $row[3] .= '<a title="'.$strmoveup.'" href="manage.php?action=moveup&roleid='.$role->id.'&sesskey='.sesskey().'">'.
+                $row[3] .= '<a title="'.$strmoveup.'" href="manage.php?action=moveup&amp;roleid='.$role->id.'&amp;sesskey='.sesskey().'">'.
                      '<img src="'.$CFG->pixpath.'/t/up.gif" height="11" width="11" border="0" alt="'.$strmoveup.'" /></a> ';
             } else {
                 $row[3] .= '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /> ';
             }
             if ($role->sortorder+1 < $rolescount) {
-                $row[3] .= '<a title="'.$strmovedown.'" href="manage.php?action=movedown&roleid='.$role->id.'&sesskey='.sesskey().'">'.
+                $row[3] .= '<a title="'.$strmovedown.'" href="manage.php?action=movedown&amp;roleid='.$role->id.'&amp;sesskey='.sesskey().'">'.
                      '<img src="'.$CFG->pixpath.'/t/down.gif" height="11" width="11" border="0" alt="'.$strmovedown.'" /></a> ';
             } else {
                 $row[3] .= '<img src="'.$CFG->wwwroot.'/pix/spacer.gif" height="11" width="11" border="0" alt="" /> ';
diff --git a/admin/uploaduser.php b/admin/uploaduser.php
index 9ce43be4f72..3b5ac3dfc39 100755
--- a/admin/uploaduser.php
+++ b/admin/uploaduser.php
@@ -381,9 +381,9 @@ $noyesoptions = array( get_string('no'), get_string('yes') );
 $maxuploadsize = get_max_upload_file_size();
 echo '<center>';
 echo '<form method="post" enctype="multipart/form-data" action="uploaduser.php">'.
-$strfile.'&nbsp;<input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'">'.
-'<input type="hidden" name="sesskey" value="'.$USER->sesskey.'">'.
-'<input type="file" name="userfile" size="30">';
+$strfile.'&nbsp;<input type="hidden" name="MAX_FILE_SIZE" value="'.$maxuploadsize.'" />'.
+'<input type="hidden" name="sesskey" value="'.$USER->sesskey.'" />'.
+'<input type="file" name="userfile" size="30" />';
 print_heading(get_string('settings'));
 echo '<table>';
 echo '<tr><td>' . get_string('passwordhandling', 'auth') . '</td><td>';
@@ -401,7 +401,7 @@ echo '<tr><td>' . get_string('allowrenames', 'admin') . '</td><td>';
 choose_from_menu($noyesoptions, 'allowrenames', $allowrenames);
 echo '</td></tr>';
 echo '</table><br />';
-echo '<input type="submit" value="'.$struploadusers.'">';
+echo '<input type="submit" value="'.$struploadusers.'" />';
 echo '</form><br />';
 echo '</center>';