diff --git a/Befund/Controllers/SupportController.swift b/Befund/Controllers/SupportController.swift
index d3f3852..107fe4f 100644
--- a/Befund/Controllers/SupportController.swift
+++ b/Befund/Controllers/SupportController.swift
@@ -212,18 +212,10 @@ class SupportController: UIViewController, UITextFieldDelegate, UIAlertViewDeleg
         let txtTopic = self.support_txtTopic.text ?? ""
         let txtMessage = self.support_txtMessage.text ?? ""
         
-        if(txtEMail.count == 0)
-        {
-            self.support_HideLoading(message: Core.Lang.Get(key: "ERROR_ENTER_EMAIL"))
-        }
-        else if(txtTopic.count == 0)
+        if(txtTopic.count == 0)
         {
             self.support_HideLoading(message: Core.Lang.Get(key: "ERROR_ENTER_TOPIC"))
         }
-        else if(txtMessage.count == 0)
-        {
-            self.support_HideLoading(message: Core.Lang.Get(key: "ERROR_ENTER_TEXT"))
-        }
         else
         {
             let deleteDevice = (txtTopic == Core.Lang.Get(key: "LBL_SUPPORT_TOPIC_ACCOUNT_DELETE"))
@@ -233,8 +225,19 @@ class SupportController: UIViewController, UITextFieldDelegate, UIAlertViewDeleg
             }
             else
             {
-                self.SendAsync(txtEmail: txtEMail, txtTopic: txtTopic, txtMessage: txtMessage, deleteDevice: deleteDevice)
-                self.support_btnSend.isEnabled = false
+                if(txtEMail.count == 0)
+                {
+                    self.support_HideLoading(message: Core.Lang.Get(key: "ERROR_ENTER_EMAIL"))
+                }
+                else if(txtMessage.count == 0)
+                {
+                    self.support_HideLoading(message: Core.Lang.Get(key: "ERROR_ENTER_TEXT"))
+                }
+                else
+                {
+                    self.SendAsync(txtEmail: txtEMail, txtTopic: txtTopic, txtMessage: txtMessage, deleteDevice: deleteDevice)
+                    self.support_btnSend.isEnabled = false
+                }
             }
         }