diff --git a/src/translation/en.json b/src/translation/en.json
index a3d7461f2..7bdf7ff07 100644
--- a/src/translation/en.json
+++ b/src/translation/en.json
@@ -788,7 +788,7 @@
             "reportPlaceholder": "Describe your issue",
             "emailPlaceholder": "If needed, provide an email address different from above to reach you",
             "emailVerifyAction": "Verify now",
-            "emailNotVerified": "Please verify the cloudron.io account email first to ensure we are able to contact you."
+            "emailNotVerified": "Your cloudron.io account email {{ email }} is not verified. Please verify it to open support tickets."
         },
         "remoteSupport": {
             "title": "Remote Support",
diff --git a/src/views/support.html b/src/views/support.html
index d7c51ca00..84eb02d4f 100644
--- a/src/views/support.html
+++ b/src/views/support.html
@@ -16,6 +16,11 @@
       </div>
       <div class="row" ng-show="config.features.support">
         <div class="col-lg-12">
+          <div ng-show="subscription && !subscription.emailVerified">
+            <p class="text-bold">{{ 'support.ticket.emailNotVerified' | tr:{ email: subscription.email } }}</p>
+            <p><a ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?email=' + subscription.emailEncoded }}" target="_blank" class="btn btn-primary">{{ 'support.ticket.emailVerifyAction' | tr }}</a></p>
+          </div>
+
           <div ng-bind-html="supportConfig.ticketFormBody | markdown2html"></div>
           <form ng-show="supportConfig.submitTickets" name="feedbackForm" ng-submit="submitFeedback()">
             <div class="form-group">
@@ -49,15 +54,9 @@
                 <input type="checkbox" ng-model="feedback.enableSshSupport" ng-disabled="!subscription.emailVerified"> {{ 'support.ticket.sshCheckbox' | tr }}
               </label>
             </div>
-            <button type="submit" class="btn btn-primary pull-right" ng-show="subscription.emailVerified" ng-disabled="feedbackForm.$invalid || feedback.busy"><i class="fa fa-circle-notch fa-spin" ng-show="feedback.busy"></i> {{ 'support.ticket.submitAction' | tr }}</button>
+            <button type="submit" class="btn btn-primary" ng-disabled="!subscription.emailVerified || feedbackForm.$invalid || feedback.busy"><i class="fa fa-circle-notch fa-spin" ng-show="feedback.busy"></i> {{ 'support.ticket.submitAction' | tr }}</button>
             <span ng-show="feedback.error" class="text-danger text-bold">{{feedback.error}}</span>
             <span ng-show="feedback.result" class="text-success text-bold">{{feedback.result.message}}</span>
-
-            <br/>
-            <div ng-hide="!subscription && !subscription.emailVerified">
-              <p class="text-bold">{{ 'support.ticket.emailNotVerified' | tr }}</p>
-              <a ng-href="{{ config.webServerOrigin + '/console.html#/userprofile?email=' + subscription.emailEncoded }}" target="_blank" class="btn btn-success">{{ 'support.ticket.emailVerifyAction' | tr }}</a>
-            </div>
           </form>
         </div>
       </div>
@@ -79,7 +78,7 @@
             <br/>
             <br/>
             <b class="pull-left text-danger text-bold" ng-show="toggleSshSupportError">{{ toggleSshSupportError }}</b>
-            <button class="btn" ng-class="!sshSupportEnabled ? 'btn-danger pull-right' : 'btn-primary pull-right'" ng-click="toggleSshSupport()">{{ sshSupportEnabled ? ('support.remoteSupport.disableAction' | tr) : ('support.remoteSupport.enableAction' | tr) }}</button>
+            <button class="btn" ng-class="!sshSupportEnabled ? 'btn-danger' : 'btn-primary'" ng-click="toggleSshSupport()">{{ sshSupportEnabled ? ('support.remoteSupport.disableAction' | tr) : ('support.remoteSupport.enableAction' | tr) }}</button>
           </div>
         </div>
       </div>
diff --git a/src/views/support.js b/src/views/support.js
index 3878c9ae6..8b1618a65 100644
--- a/src/views/support.js
+++ b/src/views/support.js
@@ -91,6 +91,7 @@ angular.module('Application').controller('SupportController', ['$scope', '$locat
             if (error && error.statusCode === 412) return; // not yet registered
             if (error) return console.error(error);
 
+            console.log(result);
             $scope.subscription = result;
         });
     }