diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh
index e48d68a..06c48b4 100755
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/afterboot.sh
@@ -2,4 +2,4 @@
 
 . ./common.inc
 
-exec ./handle-control-change.sh
+exec ./handle-control-change.sh --boot
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-network-change.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-network-change.sh
index bba6101..07b278f 100755
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-network-change.sh
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/handle-network-change.sh
@@ -2,10 +2,10 @@
 
 . ./common.inc
 
-tickets_count=$(./get-tickets_count)
+tickets_count=$(./get-tickets-count.sh)
 [ "$tickets_count" != '0' ] && exit 0
 
-if [ $1 != '--boot' ]; then
+if [ x"$1" != 'x--boot' ]; then
   [ ! -e "$FALLBACK_FILE" ] && exit 0
   ./check-network-change.sh || exit 0
 fi
diff --git a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
index 0a5f491..36ca25d 100755
--- a/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
+++ b/DNSCrypt-Preference-Pane/DNSCrypt/extra/usr/scripts/switch-to-dnscrypt-if-required.sh
@@ -7,6 +7,8 @@ PAUSE_INCREMENT=0.1
 
 [ ! -e "$DNSCRYPT_FILE" ] && exit 0
 
+./set-dns-to-dhcp.sh
+
 pause=0
 while [ -e "$DNSCRYPT_FILE" ]; do
   current_resolvers=$(./get-current-resolvers.sh)