diff --git a/files/renderer.php b/files/renderer.php
index 98c84311bb3..75ce2ab0ca4 100644
--- a/files/renderer.php
+++ b/files/renderer.php
@@ -929,7 +929,12 @@ class core_files_renderer extends plugin_renderer_base {
      * Default contents is one text input field with name="s"
      */
     public function repository_default_searchform() {
-        $str = '<div class="fp-def-search"><input name="s" value='.get_string('search', 'repository').' /></div>';
+        $searchinput = html_writer::label(get_string('searchrepo', 'repository'),
+            'reposearch', false, array('class' => 'accesshide'));
+        $searchinput .= html_writer::empty_tag('input', array('type' => 'text',
+            'id' => 'reposearch', 'name' => 's', 'value' => get_string('search', 'repository')));
+        $str = html_writer::tag('div', $searchinput, array('class' => "fp-def-search"));
+
         return $str;
     }
 }
diff --git a/lang/en/repository.php b/lang/en/repository.php
index 8682378aa37..b430e569a61 100644
--- a/lang/en/repository.php
+++ b/lang/en/repository.php
@@ -191,6 +191,7 @@ $string['saving'] = 'Saving';
 $string['automatedbackup'] = 'Automated backups';
 $string['search'] = 'Search';
 $string['searching'] = 'Search in';
+$string['searchrepo'] = 'Search repository';
 $string['select'] = 'Select';
 $string['settings'] = 'Settings';
 $string['setupdefaultplugins'] = 'Setting up default repository plugins';
diff --git a/repository/alfresco/lang/en/repository_alfresco.php b/repository/alfresco/lang/en/repository_alfresco.php
index 14f51feba1d..1a63fb1d8ca 100644
--- a/repository/alfresco/lang/en/repository_alfresco.php
+++ b/repository/alfresco/lang/en/repository_alfresco.php
@@ -32,4 +32,5 @@ $string['password'] = 'Password';
 $string['pluginname_help'] = 'A plug-in for Alfresco CMS';
 $string['pluginname'] = 'Alfresco repository';
 $string['soapmustbeenabled'] = 'SOAP extension must be enabled for alfresco plugin';
+$string['space'] = 'Space';
 $string['username'] = 'User name';
diff --git a/repository/alfresco/lib.php b/repository/alfresco/lib.php
index b991d2e49d6..14f73be41e2 100644
--- a/repository/alfresco/lib.php
+++ b/repository/alfresco/lib.php
@@ -219,7 +219,9 @@ class repository_alfresco extends repository {
 
     public function print_search() {
         $str = parent::print_search();
-        $str .= '<label>Space: </label><br /><select name="space">';
+        $str .= html_writer::label(get_string('space', 'repository_alfresco'), 'space');
+        $str .= html_writer::empty_tag('br');
+        $str .= '<select id="space" name="space">';
         foreach ($this->user_session->stores as $v) {
             $str .= '<option ';
             if ($v->__toString() === 'workspace://SpacesStore') {
diff --git a/repository/draftfiles_manager.php b/repository/draftfiles_manager.php
index abe84f5d091..53574c776c0 100644
--- a/repository/draftfiles_manager.php
+++ b/repository/draftfiles_manager.php
@@ -111,7 +111,8 @@ case 'renameform':
     $home_url->param('draftpath', $draftpath);
     $home_url->param('action', 'rename');
     echo ' <form method="post" action="'.$home_url->out().'">';
-    echo '  <input name="newfilename" type="text" value="'.s($filename).'" />';
+    echo html_writer::label(get_string('enternewname', 'repository'), 'newfilename', array('class' => 'accesshide'));
+    echo '  <input id="newfilename" name="newfilename" type="text" value="'.s($filename).'" />';
     echo '  <input name="filename" type="hidden" value="'.s($filename).'" />';
     echo '  <input name="draftpath" type="hidden" value="'.s($draftpath).'" />';
     echo '  <input type="submit" value="'.s(get_string('rename', 'moodle')).'" />';
@@ -227,7 +228,8 @@ case 'mkdirform':
     $home_url->param('draftpath', $draftpath);
     $home_url->param('action', 'mkdir');
     echo ' <form method="post" action="'.$home_url->out().'">';
-    echo '  <input name="newdirname" type="text" />';
+    echo html_writer::label(get_string('entername', 'repository'), 'newdirname', array('class' => 'accesshide'));
+    echo '  <input name="newdirname" id="newdirname" type="text" />';
     echo '  <input name="draftpath" type="hidden" value="'.s($draftpath).'" />';
     echo '  <input type="submit" value="'.s(get_string('makeafolder', 'moodle')).'" />';
     echo ' </form>';
diff --git a/repository/filepicker.php b/repository/filepicker.php
index 1b673318b1a..c10eddf8393 100644
--- a/repository/filepicker.php
+++ b/repository/filepicker.php
@@ -351,8 +351,8 @@ case 'confirm':
     echo '<form method="post">';
     echo '<table>';
     echo '  <tr>';
-    echo '    <td><label>'.get_string('filename', 'repository').'</label></td>';
-    echo '    <td><input type="text" name="filename" value="'.s($filename).'" /></td>';
+    echo '    <td>'. html_writer::label(get_string('filename', 'repository'), 'filename'). '</td>';
+    echo '    <td><input type="text" id="filename" name="filename" value="'.s($filename).'" /></td>';
     echo '    <td><input type="hidden" name="fileurl" value="'.s($fileurl).'" /></td>';
     echo '    <td><input type="hidden" name="action" value="download" /></td>';
     echo '    <td><input type="hidden" name="itemid" value="'.s($itemid).'" /></td>';