diff --git a/repository/filepicker.js b/repository/filepicker.js
index ee5b942e8f6..2046cd2fb09 100644
--- a/repository/filepicker.js
+++ b/repository/filepicker.js
@@ -697,6 +697,7 @@ M.core_filepicker.init = function(Y, options) {
             this.active_repo.nosearch = data.nosearch?true:false;
             this.active_repo.norefresh = data.norefresh?true:false;
             this.active_repo.nologin = data.nologin?true:false;
+            this.active_repo.logouttext = data.logouttext?data.logouttext:null;
             this.active_repo.help = data.help?data.help:null;
             this.active_repo.manage = data.manage?data.manage:null;
         },
@@ -1174,7 +1175,8 @@ M.core_filepicker.init = function(Y, options) {
                 toolbar.appendChild(refresh);
             }
             if(!r.nologin) {
-                var html = '<a href="###"><img src="'+M.util.image_url('a/logout')+'" /> '+M.str.repository.logout+'</a>';
+                var label = r.logouttext?r.logouttext:M.str.repository.logout;
+                var html = '<a href="###"><img src="'+M.util.image_url('a/logout')+'" /> '+label+'</a>';
                 var logout = Y.Node.create(html);
                 logout.on('click', function() {
                     this.request({
diff --git a/repository/flickr_public/lang/en/repository_flickr_public.php b/repository/flickr_public/lang/en/repository_flickr_public.php
index 5e708886b78..05bbba04427 100644
--- a/repository/flickr_public/lang/en/repository_flickr_public.php
+++ b/repository/flickr_public/lang/en/repository_flickr_public.php
@@ -25,6 +25,7 @@
 
 $string['all'] = 'All';
 $string['apikey'] = 'API key';
+$string['backtosearch'] = 'Back to search screen';
 $string['by'] = 'Attribution License';
 $string['by-nc'] = 'Attribution-NonCommercial License';
 $string['by-nc-nd'] = 'Attribution-NonCommercial-NoDerivs License';
diff --git a/repository/flickr_public/lib.php b/repository/flickr_public/lib.php
index 4e862a9dd4a..465a8cef948 100644
--- a/repository/flickr_public/lib.php
+++ b/repository/flickr_public/lib.php
@@ -332,6 +332,9 @@ class repository_flickr_public extends repository {
             $ret['manage'] = $photos_url;
         }
         $ret['list']  = array();
+        $ret['nosearch'] = true;
+        $ret['norefresh'] = true;
+        $ret['logouttext'] = get_string('backtosearch', 'repository_flickr_public');
         $ret['pages'] = $photos['pages'];
         if (is_int($page) && $page <= $ret['pages']) {
             $ret['page'] = $page;