diff --git a/extensions/ter_fe2/Resources/Private/Templates/Registerkey/Index.html b/extensions/ter_fe2/Resources/Private/Templates/Registerkey/Index.html
index da84256f79e3e51f91f5910914316e08bf78a7af..ba1238d8f6032ab2b5cb8ff008cfac281c2f16ca 100644
--- a/extensions/ter_fe2/Resources/Private/Templates/Registerkey/Index.html
+++ b/extensions/ter_fe2/Resources/Private/Templates/Registerkey/Index.html
@@ -49,84 +49,93 @@
 
     <div class="tab-content">
         <div class="tab-pane active" id="myextensions" role="tabpanel">
-            <table class="table table-striped">
-                <thead>
-                <tr>
-                    <th>
-                        <f:translate key="extensionKey" />
-                    </th>
-                    <th>
-                        Likes
-                    </th>
-                    <th class="text-right">
-                        Actions
-                    </th>
-                </tr>
-                </thead>
-                <tbody>
-                <f:for each="{extensions}" as="extension">
-                    <tr>
-                        <td>
-                            <f:if condition="{extension.versionCount} < 1">
-                                <f:then>
-                                    {extension.extKey}
-                                </f:then>
-                                <f:else>
-                                    <f:link.action pageUid="{settings.pages.extensionDetailPID}" controller="Extension" action="show" arguments="{extension : extension}">{extension.extKey}</f:link.action>
-                                    / <span class="ter-ext-state-{extension.lastVersion.state}">{extension.lastVersion.state}</span>
-                                </f:else>
-                            </f:if>
-                            <br />
-                            <small>
-                                <f:if condition="{extension.versionCount} < 1">
-                                    <f:then>
-                                        <f:translate key="tx_terfe2_domain_model_extension.versions.no" />
-                                    </f:then>
-                                    <f:else>
-                                        <f:if condition="{extension.versionCount} > 1">
+            <f:if condition="{extensions -> f:count()} == 0" >
+                <f:then>
+                    <div class="alert alert-info mt-3">
+                        You do not have any registered extension keys yet.
+                    </div>
+                </f:then>
+                <f:else>
+                    <table class="table table-striped">
+                        <thead>
+                        <tr>
+                            <th>
+                                <f:translate key="extensionKey" />
+                            </th>
+                            <th>
+                                Likes
+                            </th>
+                            <th class="text-right">
+                                Actions
+                            </th>
+                        </tr>
+                        </thead>
+                        <tbody>
+                        <f:for each="{extensions}" as="extension">
+                            <tr>
+                                <td>
+                                    <f:if condition="{extension.versionCount} < 1">
+                                        <f:then>
+                                            {extension.extKey}
+                                        </f:then>
+                                        <f:else>
+                                            <f:link.action pageUid="{settings.pages.extensionDetailPID}" controller="Extension" action="show" arguments="{extension : extension}">{extension.extKey}</f:link.action>
+                                            / <span class="ter-ext-state-{extension.lastVersion.state}">{extension.lastVersion.state}</span>
+                                        </f:else>
+                                    </f:if>
+                                    <br />
+                                    <small>
+                                        <f:if condition="{extension.versionCount} < 1">
                                             <f:then>
-                                                <f:translate key="tx_terfe2_domain_model_extension.versions.multiple" arguments="{0: extension.versionCount}" />
+                                                <f:translate key="tx_terfe2_domain_model_extension.versions.no" />
                                             </f:then>
                                             <f:else>
-                                                <f:translate key="tx_terfe2_domain_model_extension.versions.one" />
+                                                <f:if condition="{extension.versionCount} > 1">
+                                                    <f:then>
+                                                        <f:translate key="tx_terfe2_domain_model_extension.versions.multiple" arguments="{0: extension.versionCount}" />
+                                                    </f:then>
+                                                    <f:else>
+                                                        <f:translate key="tx_terfe2_domain_model_extension.versions.one" />
+                                                    </f:else>
+                                                </f:if>
+                                                (last upload on <f:format.date format="m/d/Y h:i a (T)">{extension.lastVersion.uploadDate}</f:format.date>)
                                             </f:else>
                                         </f:if>
-                                        (last upload on <f:format.date format="m/d/Y h:i a (T)">{extension.lastVersion.uploadDate}</f:format.date>)
-                                    </f:else>
-                                </f:if>
-                            </small>
-                        </td>
-                        <td>
-                            <f:render partial="Like" arguments="{extension: extension, showOnly: 1}" />
-                        </td>
-                        <td class="text-right">
-                            <f:if condition="{extension.versionCount} < 1">
-                                <f:then>
-                                    <f:link.action class="btn btn-danger" onclick="if (confirm('Really delete key \"{extension.extKey}\"?')) return true; else return false;" action="delete" controller="Registerkey" arguments="{extension: extension}">
-                                        <i class="fa fa-trash-o"></i>
-                                        Delete
+                                    </small>
+                                </td>
+                                <td>
+                                    <f:render partial="Like" arguments="{extension: extension, showOnly: 1}" />
+                                </td>
+                                <td class="text-right">
+                                    <f:if condition="{extension.versionCount} < 1">
+                                        <f:then>
+                                            <f:link.action class="btn btn-danger" onclick="if (confirm('Really delete key \"{extension.extKey}\"?')) return true; else return false;" action="delete" controller="Registerkey" arguments="{extension: extension}">
+                                            <i class="fa fa-trash-o"></i>
+                                            Delete
+                                            </f:link.action>
+                                        </f:then>
+                                        <f:else>
+                                            <f:link.action class="btn btn-secondary" onclick="if (confirm('Really abandon key \"{extension.extKey}\"?')) return true; else return false;" action="transfer" controller="Registerkey" arguments="{extension: extension, newUser: 'abandoned_extensions'}">
+                                            <i class="fa fa-trash-o"></i>
+                                            Abandon
+                                            </f:link.action>
+                                        </f:else>
+                                    </f:if>
+                                    <f:link.action class="btn btn-info" action="edit" controller="Extension" arguments="{extension: extension}">
+                                        <i class="fa fa-pencil"></i>
+                                        Edit
                                     </f:link.action>
-                                </f:then>
-                                <f:else>
-                                    <f:link.action class="btn btn-secondary" onclick="if (confirm('Really abandon key \"{extension.extKey}\"?')) return true; else return false;" action="transfer" controller="Registerkey" arguments="{extension: extension, newUser: 'abandoned_extensions'}">
-                                        <i class="fa fa-trash-o"></i>
-                                        Abandon
+                                    <f:link.action class="btn btn-success" action="uploadVersion" controller="Extension" arguments="{extension: extension}" pageUid="{settings.pages.uploadVersionPID}">
+                                        <i class="fa fa-arrow-circle-o-up"></i>
+                                        Upload
                                     </f:link.action>
-                                </f:else>
-                            </f:if>
-                            <f:link.action class="btn btn-info" action="edit" controller="Extension" arguments="{extension: extension}">
-                                <i class="fa fa-pencil"></i>
-                                Edit
-                            </f:link.action>
-                            <f:link.action class="btn btn-success" action="uploadVersion" controller="Extension" arguments="{extension: extension}" pageUid="{settings.pages.uploadVersionPID}">
-                                <i class="fa fa-arrow-circle-o-up"></i>
-                                Upload
-                            </f:link.action>
-                        </td>
-                    </tr>
-                </f:for>
-                </tbody>
-            </table>
+                                </td>
+                            </tr>
+                        </f:for>
+                        </tbody>
+                    </table>
+                </f:else>
+            </f:if>
         </div>
         <f:if condition="{expiringExtensions -> f:count()}">