diff --git a/src/Auth/Source/Radius.php b/src/Auth/Source/Radius.php
index 20cc029..3d61105 100644
--- a/src/Auth/Source/Radius.php
+++ b/src/Auth/Source/Radius.php
@@ -157,11 +157,7 @@ protected function login(
             $radius->setIncludeMessageAuthenticator();
 
             $httpUtils = new Utils\HTTP();
-            $radius->setNasIpAddress($_SERVER['SERVER_ADDR'] ?: $httpUtils->getSelfHost());
-
-            if ($this->nasIdentifier !== null) {
-                $radius->setAttribute((string)self::RADIUS_NAS_IDENTIFIER, $this->nasIdentifier);
-            }
+            $radius->setAttribute((string)self::RADIUS_NAS_IDENTIFIER, $this->nasIdentifier ?: $httpUtils->getSelfHost());
 
             if ($this->realm !== null) {
                 $radius->setRadiusSuffix('@' . $this->realm);