diff --git a/public/index.html b/public/index.html
index dc7b4ffc7ead2034c37cf6f375b8426f679141a2..3f7cf57dbd2e6afd083e90db9e5419ec8824180b 100644
--- a/public/index.html
+++ b/public/index.html
@@ -24,7 +24,7 @@
             <div id="error-proxy" class="error">You are not a StuStaNet member and did not configure the proxy server. <a href="http://conntest.stustanet.de/nomember">Click here for further information</a>.</div>
             <div id="error-blocked" class="error">Your Internet Access is blocked due to malware or malicious behavior. <a href="http://conntest.stustanet.de/blocked">Click here to view the blocking page with more information</a>.</div>
             <div id="error-unknown" class="error">An unknown error occurred. Please contact a network administrator and attach the log at the bottom of this page.</div>
-            <div id="warn-nat" class="warn">Network Address Translation (NAT) is not working, meaning that many application will not work as expected. However, this is expected, as you do not seem to be a StuStaNet member. NAT is a members-only service.<br />You can <a href="https://reg.stustanet.de/">become a member here.</a></div>
+            <div id="warn-nat" class="warn">Network Address Translation (NAT) is not working, meaning that many application will not work as expected. However, this is expected if you are not a StuStaNet member as NAT is a members-only service.<br />You can <a href="https://reg.stustanet.de/">become a member here.</a></div>
             <div id="status">Initializing...</div>
             <table id="tests">
                 <thead>
diff --git a/public/js/selftest.js b/public/js/selftest.js
index 1b9884f40cab356bda944a13426dddf81e223b3f..0b553b1de0c5ef73f71f199efa6be5d4dc8b6b29 100644
--- a/public/js/selftest.js
+++ b/public/js/selftest.js
@@ -7,8 +7,6 @@ const iceServer = "stun:conntest.stustanet.de:3478";
 
 const timeout = 10000; // 10s
 
-let noMember = false;
-
 function isIncompatibleBrowser() {
     let ua = window.navigator.userAgent;
     let isIE = /msie\s|trident\/|edge\//i.test(ua) &&
@@ -82,7 +80,6 @@ function checkStatus(url) {
                             reject("BLOCKED");
                             return;
                         case "NOMEMBER":
-                            noMember = true;
                             showBox('error-proxy');
                             reject("NOPROXY");
                             return;
@@ -202,11 +199,7 @@ function checkNAT() {
         ice().then(function(candidate) {
             if (candidate === null) {
                 log("ICE failed. WebRTC might be disabled or not supported.");
-                if (noMember) {
-                    showBox('warn-nat');
-                } else {
-                    showUnknown();
-                }
+                showBox('warn-nat');
                 reject('FAIL')
             } else {
                 log("Detected External IP: " + candidate.address);
@@ -220,11 +213,7 @@ function checkNAT() {
             }
         }).catch(function(error) {
             log("Error: " + error);
-            if (noMember) {
-                showBox('warn-nat');
-            } else {
-                showUnknown();
-            }
+            showBox('warn-nat');
             reject(error);
         });
     });