diff --git a/src/8021x b/src/8021x
index 7657ead..63de6cc 100644
--- a/src/8021x
+++ b/src/8021x
@@ -11,7 +11,7 @@ wpa_check()
         else
             eval $(wpa_cli -i "$INTERFACE" status | fgrep "wpa_state=")
         fi
-        [[ "$wpa_state" = "COMPLETED" ]]
+        [[ "$wpa_state" = "ASSOCIATED" ]] || [[ "$wpa_state" = "COMPLETED" ]]
         ) && return 0
         sleep 1
         let timeout++
diff --git a/src/connections/ethernet b/src/connections/ethernet
index 36f6b93..edc2abe 100644
--- a/src/connections/ethernet
+++ b/src/connections/ethernet
@@ -143,6 +143,12 @@ ethernet_down() {
         fi
     fi
 
+    if checkyesno "${AUTH8021X:-no}"; then
+        . "$SUBR_DIR/8021x"
+        report_debug ethernet_down stop_wpa "$INTERFACE"
+        stop_wpa "$INTERFACE"
+    fi
+    
     report_debug ethernet_down if_down
     if [[ "$CONNECTION" == "wireless" ]]; then
         bring_interface flush "$INTERFACE"