diff --git a/src/views/support.html b/src/views/support.html
index b63d6548d..3ffcc6c2e 100644
--- a/src/views/support.html
+++ b/src/views/support.html
@@ -15,16 +15,12 @@
         <p ng-bind-html=" 'support.ticket.subscriptionRequiredDescription' | tr:{ supportViewLink: 'https://docs.cloudron.io/apps/?support_view', forumLink: 'https://forum.cloudron.io/' } "></p>
       </div>
       <div class="row" ng-show="config.features.support">
-        <div class="col-lg-12" 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>
-        <div class="col-lg-12" ng-show="subscription.emailVerified">
+        <div class="col-lg-12">
           <div ng-bind-html="supportConfig.ticketFormBody | markdown2html"></div>
           <form ng-show="supportConfig.submitTickets" name="feedbackForm" ng-submit="submitFeedback()">
             <div class="form-group">
               <label>{{ 'support.ticket.type' | tr }}</label>
-              <select class="form-control" name="type" style="width: 50%;" ng-model="feedback.type" required>
+              <select class="form-control" name="type" style="width: 50%;" ng-model="feedback.type" required ng-disabled="!subscription.emailVerified">
                 <option value="app_error">{{ 'support.ticket.typeApp' | tr }}</option>
                 <option value="ticket">{{ 'support.ticket.typeBug' | tr }}</option>
                 <option value="email_error">{{ 'support.ticket.typeEmail' | tr }}</option>
@@ -32,30 +28,36 @@
             </div>
             <div class="form-group" ng-show="feedback.type === 'app_error'">
               <label>{{ 'support.ticket.selectApp' | tr }}</label>
-              <select class="form-control" name="type" style="width: 50%;" ng-model="feedback.appId" ng-required="feedback.type === 'app_error'">
-              <option ng-repeat="app in apps" value="{{ app.id }}">{{ app.fqdn }}</option>
+              <select class="form-control" name="type" style="width: 50%;" ng-model="feedback.appId" ng-required="feedback.type === 'app_error'" ng-disabled="!subscription.emailVerified">
+                <option ng-repeat="app in apps" value="{{ app.id }}">{{ app.fqdn }}</option>
               </select>
             </div>
             <div class="form-group" ng-class="{ 'has-error': (feedbackForm.subject.$dirty && feedbackForm.subject.$invalid) }">
               <label>{{ 'support.ticket.topic' | tr }}</label>
-              <input type="text" class="form-control" name="subject" ng-model="feedback.subject" ng-maxlength="512" ng-minlength="1" required>
+              <input type="text" class="form-control" name="subject" ng-model="feedback.subject" ng-maxlength="512" ng-minlength="1" required ng-disabled="!subscription.emailVerified">
             </div>
             <div class="form-group" ng-class="{ 'has-error': (feedbackForm.description.$dirty && feedbackForm.description.$invalid) }">
               <label>{{ 'support.ticket.report' | tr }}</label>
-              <textarea class="form-control" name="description" rows="3" placeholder="{{ 'support.ticket.reportPlaceholder' | tr }}" ng-model="feedback.description" ng-minlength="1" required></textarea>
+              <textarea class="form-control" name="description" rows="3" placeholder="{{ 'support.ticket.reportPlaceholder' | tr }}" ng-model="feedback.description" ng-minlength="1" required ng-disabled="!subscription.emailVerified"></textarea>
             </div>
             <div class="form-group" ng-class="{ 'has-error': (feedbackForm.email.$dirty && feedbackForm.email.$invalid) }">
               <label>{{ 'support.ticket.email' | tr }}</label> <small>{{ 'support.ticket.emailInfo' | tr:{ email: subscription.email } }}</small>
-              <input type="text" class="form-control" name="email" placeholder="{{ 'support.ticket.emailPlaceholder' | tr }}" ng-model="feedback.altEmail" ng-maxlength="512" ng-minlength="1" ng-required="feedback.type === 'email_error'">
+              <input type="text" class="form-control" name="email" placeholder="{{ 'support.ticket.emailPlaceholder' | tr }}" ng-model="feedback.altEmail" ng-maxlength="512" ng-minlength="1" ng-required="feedback.type === 'email_error'" ng-disabled="!subscription.emailVerified">
             </div>
             <div class="form-group">
               <label class="control-label">
-                <input type="checkbox" ng-model="feedback.enableSshSupport"> {{ 'support.ticket.sshCheckbox' | tr }}
+                <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-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 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>
             <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>