diff --git a/src/views/email.html b/src/views/email.html
index 7c300cbf2..731bd98c5 100644
--- a/src/views/email.html
+++ b/src/views/email.html
@@ -264,7 +264,8 @@
           <div class="row">
             <div class="col-md-10">
               Cloudron <a ng-href="{{ config.webServerOrigin + '/documentation/email/' }}" target="_blank">Email Server</a> allows users to receive email for this domain.
-              Cloudron Apps like Rainloop, SOGo, Roundcube are already configured to access Cloudron Email. Use <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#mail_settings">these settings</a>
+              <a href="/#/appstore/net.rainloop.cloudronapp">Rainloop</a>, <a href="/#/appstore/nu.sogo.cloudronapp2">SOGo</a>,
+              <a href="/#/appstore/net.roundcube.cloudronapp">Roundcube</a> are pre-configured to access Cloudron Email. Use <a href="" data-toggle="collapse" data-parent="#accordion" data-target="#mail_settings">these settings</a>
               to configure other email clients.
             </div>
             <div class="col-md-2" ng-show="selectedDomain.provider !== 'caas'">
@@ -281,7 +282,7 @@
                 <p><b>Incoming Mail (IMAP)</b><br/>Server: <span ng-click-select>{{config.mailFqdn}}</span><br/>Port: 993 (TLS)</p>
                 <p><b>Outgoing Mail (SMTP)</b><br/>Server: <span ng-click-select>{{config.mailFqdn}}</span><br/>Port: 587 (STARTTLS)</p>
                 <p><b>ManageSieve</b><br/>Server: <span ng-click-select>{{config.mailFqdn}}</span><br/>Port: 4190 (STARTTLS)</p>
-                <p>Use <i>username</i>@{{ selectedDomain.domain }} and the Cloudron password to access mailboxes of this domain</p>
+                <p>Use <i>mailboxname</i>@{{ selectedDomain.domain }} and the mailbox owner password to access mailboxes of this domain</p>
               </div>
             </div>
           </div>