Improved UX, security and presentation.

1 files changed, 7 insertions, 3 deletions

diff --git a/server.go b/server.go
index 387b5b6..975b549 100644
--- a/server.go
+++ b/server.go
@@ -25,9 +25,13 @@ func CreateNewEntry(email, password string) error {
 
 	// Checks for correct DNS
 	if !vD.ValidateDomainMX(server) {
-		if !vD.ValidateDomain(server) {
-			return errors.New("Neither the MX record nor the domain itself point to this server. Please fix your DNS.")
-		}
+		return errors.New("Wrong DNS setup. The MX record does not point to this server. Please fix your DNS.")
+
+		// We require the correct MX entry, not just a A record.
+		//
+		//if !vD.ValidateDomain(server) {
+		//	return errors.New("Neither the MX record nor the domain itself point to this server. Please fix your DNS.")
+		//}
 	}
 
 	if !vD.DomainExists() {