diff --git a/phpBB/adm/style/acp_ext_catalog.html b/phpBB/adm/style/acp_ext_catalog.html
index 482d8a8bda..a6e9995cbb 100644
--- a/phpBB/adm/style/acp_ext_catalog.html
+++ b/phpBB/adm/style/acp_ext_catalog.html
@@ -81,6 +81,11 @@
 	</fieldset>
 </form>
 
+{% if extensions is empty %}
+<tr>
+	<td colspan="4"><div class="errorbox notice">{{ lang('NO_EXTENSION_AVAILABLE') }}</div></td>
+</tr>
+{% else %}
 <table class="table1">
 	<col class="row1" ><col class="row1" ><col class="row1" ><col class="row2" >
 <thead>
@@ -116,6 +121,7 @@
 {% endfor %}
 </tbody>
 </table>
+{% endif %}
 
 {% if pagination is defined %}
 	<div class="pagination bottom-pagination">
diff --git a/phpBB/language/en/acp/extensions.php b/phpBB/language/en/acp/extensions.php
index d7c111c3b6..9c4b7daf9f 100644
--- a/phpBB/language/en/acp/extensions.php
+++ b/phpBB/language/en/acp/extensions.php
@@ -154,10 +154,11 @@ $lang = array_merge($lang, array(
 	'ENABLE_ON_INSTALL'				=> 'Enable extensions when installing',
 	'PURGE_ON_REMOVE'				=> 'Purge extensions when removing',
 	'ENABLE_PACKAGIST'				=> 'Enable Packagist usage',
-	'ENABLE_PACKAGIST_EXPLAIN'		=> 'TODO: text explaining why packagist shouldn\'t be enabled, dev usage, etc...',
-	'ENABLE_PACKAGIST_CONFIRM'		=> 'TODO: are you sure you ant to enable packagist?',
+	'ENABLE_PACKAGIST_EXPLAIN'		=> 'Allow the usage of packagist while looking for available extensions. It must be used carefully as it will add not validated extensions to the catalog.',
+	'ENABLE_PACKAGIST_CONFIRM'		=> 'Are you sure you want to enable packagist?',
 	'COMPOSER_REPOSITORIES'			=> 'Repositories',
-	'COMPOSER_REPOSITORIES_EXPLAIN'	=> 'TODO: One repo per line',
+	'COMPOSER_REPOSITORIES_EXPLAIN'	=> 'List of composer repositories (must be the base url of the packages.json file), one per line.',
+	'NO_EXTENSION_AVAILABLE'		=> 'There is no extension available for your board',
 
 	'EXTENSION_MANAGED_SUCCESS'		=> 'The extension %s is now managed automatically.',
 	'EXTENSIONS_INSTALLED'			=> 'Extensions successfully installed.',