diff --git a/advanced/Scripts/speedtestmod/mod.sh b/advanced/Scripts/speedtestmod/mod.sh
index 0f4749b1aa..49d758abbc 100755
--- a/advanced/Scripts/speedtestmod/mod.sh
+++ b/advanced/Scripts/speedtestmod/mod.sh
@@ -17,9 +17,10 @@ help() {
 }
 
 setTags() {
-    local path=${1-}
-    local name=${2-}
-    local branch="${3-master}"
+    local path=${1:-}
+    local name=${2:-}
+    local branch="${3:-master}"
+
     if [ ! -z "$path" ]; then
         cd "$path"
         git fetch origin $branch:refs/remotes/origin/$branch -q
@@ -28,7 +29,9 @@ setTags() {
     fi
     if [ ! -z "$name" ]; then
         localTag=$(pihole -v | grep "$name" | cut -d ' ' -f 6)
-        [ "$localTag" == "HEAD" ] && localTag=$(pihole -v | grep "$name" | cut -d ' ' -f 7)
+        if [ "$localTag" == "HEAD" ]; then
+            localTag=$(pihole -v | grep "$name" | cut -d ' ' -f 7)
+        fi
     fi
 }
 
@@ -36,14 +39,15 @@ download() {
     local path=$1
     local name=$2
     local url=$3
-    local src=${4-}
-    local branch="${5-master}"
+    local src=${4:-}
+    local branch="${5:-master}"
     local dest=$path/$name
-    if [ ! -d $dest ]; then # replicate
+
+    if [ ! -d "$dest" ]; then # replicate
         cd "$path"
         rm -rf "$name"
         git clone --depth=1 -b "$branch" "$url" "$name"
-        setTags "$name" "$src" $branch
+        setTags "$name" "${src:-}" "$branch"
         if [ ! -z "$src" ]; then
             if [[ "$localTag" == *.* ]] && [[ "$localTag" < "$latestTag" ]]; then
                 latestTag=$localTag
@@ -51,27 +55,27 @@ download() {
             fi
         fi
     else # replace
-        setTags $dest "" $branch
+        cd "$dest"
         if [ ! -z "$src" ]; then
             if [ "$url" != "old" ]; then
                 git config --global --add safe.directory "$dest"
                 git remote -v | grep -q "old" || git remote rename origin old
                 git remote -v | grep -q "origin" && git remote remove origin
-                git remote add origin $url
+                git remote add -t "$branch" origin "$url"
             elif [ -d .git/refs/remotes/old ]; then
                 git remote remove origin
                 git remote rename old origin
+                git clean -ffdx
             fi
-            git fetch origin -q
         fi
-        git reset --hard origin/$branch
-        git checkout -B $branch -q
-        git branch -u origin/$branch
-        git clean -ffdx
+        setTags "$dest" "${src:-}" "$branch"
+        git reset --hard origin/"$branch"
+        git checkout -B "$branch"
+        git branch -u origin/"$branch"
     fi
 
     if [ "$(git rev-parse HEAD)" != "$(git rev-parse $latestTag)" ]; then
-        git -c advice.detachedHead=false checkout $latestTag
+        git -c advice.detachedHead=false checkout "$latestTag"
     fi
     cd ..
 }
@@ -87,7 +91,7 @@ isEmpty() {
 }
 
 manageHistory() {
-    if [ "${1-}" == "db" ]; then
+    if [ "${1:-}" == "db" ]; then
         if [ -f $curr_db ] && ! isEmpty $curr_db; then
             echo "Flushing Database..."
             mv -f $curr_db $last_db
@@ -96,6 +100,7 @@ manageHistory() {
             fi
             if [ -f /var/log/pihole/speedtest.log ]; then
                 mv -f /var/log/pihole/speedtest.log /var/log/pihole/speedtest.log.old
+                rm -f /etc/pihole/speedtest.log
             fi
         elif [ -f $last_db ]; then
             echo "Restoring Database..."
@@ -105,20 +110,22 @@ manageHistory() {
             fi
             if [ -f /var/log/pihole/speedtest.log.old ]; then
                 mv -f /var/log/pihole/speedtest.log.old /var/log/pihole/speedtest.log
+                cp -af /var/log/pihole/speedtest.log /etc/pihole/speedtest.log
             fi
         fi
     fi
 }
 
 notInstalled() {
-    if [ -x "$(command -v yum)" ] || [ -x "$(command -v dnf)" ]; then
-        rpm -q "$1" &>/dev/null || return 0
-    elif [ -x "$(command -v apt-get)" ]; then
+    if [ -x "$(command -v apt-get)" ]; then
         dpkg -s "$1" &>/dev/null || return 0
+    elif [ -x "$(command -v dnf)" ] || [ -x "$(command -v yum)" ]; then
+        rpm -q "$1" &>/dev/null || return 0
     else
         echo "Unsupported package manager!"
         exit 1
     fi
+
     return 1
 }
 
@@ -131,13 +138,9 @@ install() {
     fi
 
     local PHP_VERSION=$(php -v | head -n 1 | awk '{print $2}' | cut -d "." -f 1,2)
-    local PKG_MANAGER=$(command -v apt-get || command -v yum || command -v dnf)
+    local PKG_MANAGER=$(command -v apt-get || command -v dnf || command -v yum)
     local PKGS=(bc sqlite3 jq tmux wget "php$PHP_VERSION-sqlite3")
 
-    if [[ "$PKG_MANAGER" == *"apt-get"* ]]; then
-        apt-get update
-    fi
-
     local missingPkgs=()
     for pkg in "${PKGS[@]}"; do
         if notInstalled "$pkg"; then
@@ -146,44 +149,42 @@ install() {
     done
 
     if [ ${#missingPkgs[@]} -gt 0 ]; then
-        sudo $PKG_MANAGER install -y "${missingPkgs[@]}"
+        if [[ "$PKG_MANAGER" == *"apt-get"* ]]; then
+            apt-get update
+        fi
+        $PKG_MANAGER install -y "${missingPkgs[@]}"
     fi
 
-    if [[ "$PKG_MANAGER" == *"yum"* || "$PKG_MANAGER" == *"dnf"* ]]; then
-        if [ ! -f /etc/yum.repos.d/ookla_speedtest-cli.repo ]; then
-            echo "Adding speedtest source for RPM..."
-            sudo bash -c 'curl -sSLN https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.rpm.sh | sudo bash'
-        fi
-    elif [[ "$PKG_MANAGER" == *"apt-get"* ]]; then
-        if [ ! -f /etc/apt/sources.list.d/ookla_speedtest-cli.list ]; then
-            echo "Adding speedtest source for DEB..."
-            if [ -e /etc/os-release ]; then
-                . /etc/os-release
-                local base="ubuntu debian"
-                local os=${ID}
-                local dist=${VERSION_CODENAME}
-                if [ ! -z "${ID_LIKE-}" ] && [[ "${base//\"/}" =~ "${ID_LIKE//\"/}" ]] && [ "${os}" != "ubuntu" ]; then
-                    os=${ID_LIKE%% *}
-                    [ -z "${UBUNTU_CODENAME-}" ] && UBUNTU_CODENAME=$(/usr/bin/lsb_release -cs)
-                    dist=${UBUNTU_CODENAME}
-                    [ -z "$dist" ] && dist=${VERSION_CODENAME}
+    if notInstalled speedtest && notInstalled speedtest-cli; then
+        if [[ "$PKG_MANAGER" == *"yum"* || "$PKG_MANAGER" == *"dnf"* ]]; then
+            if [ ! -f /etc/yum.repos.d/ookla_speedtest-cli.repo ]; then
+                echo "Adding speedtest source for RPM..."
+                curl -sSLN https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.rpm.sh | sudo bash
+            fi
+        elif [[ "$PKG_MANAGER" == *"apt-get"* ]]; then
+            if [ ! -f /etc/apt/sources.list.d/ookla_speedtest-cli.list ]; then
+                echo "Adding speedtest source for DEB..."
+                if [ -e /etc/os-release ]; then
+                    . /etc/os-release
+                    local base="ubuntu debian"
+                    local os=${ID}
+                    local dist=${VERSION_CODENAME}
+                    if [ ! -z "${ID_LIKE-}" ] && [[ "${base//\"/}" =~ "${ID_LIKE//\"/}" ]] && [ "${os}" != "ubuntu" ]; then
+                        os=${ID_LIKE%% *}
+                        [ -z "${UBUNTU_CODENAME-}" ] && UBUNTU_CODENAME=$(/usr/bin/lsb_release -cs)
+                        dist=${UBUNTU_CODENAME}
+                        [ -z "$dist" ] && dist=${VERSION_CODENAME}
+                    fi
+                    wget -O /tmp/script.deb.sh https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh >/dev/null 2>&1
+                    chmod +x /tmp/script.deb.sh
+                    os=$os dist=$dist /tmp/script.deb.sh
+                    rm -f /tmp/script.deb.sh
+                else
+                    curl -sSLN https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | sudo bash
                 fi
-                wget -O /tmp/script.deb.sh https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh >/dev/null 2>&1
-                chmod +x /tmp/script.deb.sh
-                os=$os dist=$dist /tmp/script.deb.sh
-                rm -f /tmp/script.deb.sh
-            else
-                curl -sSLN https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | sudo bash
             fi
         fi
-    fi
-
-    if notInstalled speedtest && notInstalled speedtest-cli; then
-        sudo $PKG_MANAGER install -y speedtest
-    fi
-    if [ -f /usr/local/bin/speedtest ]; then
-        rm -f /usr/local/bin/speedtest
-        ln -s /usr/bin/speedtest /usr/local/bin/speedtest
+        $PKG_MANAGER install -y speedtest
     fi
 
     download /opt mod_pihole https://github.com/arevindh/pi-hole
@@ -199,8 +200,8 @@ install() {
     cp -af /opt/mod_pihole/advanced/Scripts/webpage.sh $curr_wp
     cp -af /opt/mod_pihole/advanced/Scripts/speedtestmod/. /opt/pihole/speedtestmod/
     chmod +x $curr_wp
-    pihole -a -s
     pihole updatechecker local
+    pihole -a -s
 }
 
 uninstall() {
@@ -216,7 +217,7 @@ uninstall() {
             rm -rf org_pihole
         fi
 
-        pihole -a -s 0
+        pihole -a -s -1
         download $admin_dir admin https://github.com/pi-hole/AdminLTE web
         if [ ! -f $last_wp ]; then
             cp -af $curr_wp $last_wp
@@ -227,7 +228,7 @@ uninstall() {
         pihole updatechecker
     fi
 
-    manageHistory ${1-}
+    manageHistory ${1:-}
 }
 
 purge() {
@@ -257,7 +258,7 @@ update() {
     else
         echo "Systemd not found. Skipping Pi-hole update..."
     fi
-    if [ "${1-}" == "un" ]; then
+    if [ "${1:-}" == "un" ]; then
         purge
         exit 0
     fi
@@ -296,7 +297,7 @@ commit() {
 
 main() {
     printf "Thanks for using Speedtest Mod!\nScript by @ipitio\n\n$(date)\n\n"
-    local op=${1-}
+    local op=${1:-}
     if [ "$op" == "-h" ] || [ "$op" == "--help" ]; then
         help
         exit 0
@@ -310,7 +311,7 @@ main() {
     trap '[ "$?" -eq "0" ] && commit || abort' EXIT
     trap 'abort' INT TERM
 
-    local db=$([ "$op" == "up" ] && echo "${3-}" || [ "$op" == "un" ] && echo "${2-}" || echo "$op")
+    local db=$([ "$op" == "up" ] && echo "${3:-}" || [ "$op" == "un" ] && echo "${2:-}" || echo "$op")
     case $op in
     db)
         manageHistory $db
@@ -321,7 +322,7 @@ main() {
         ;;
     up)
         uninstall $db
-        update ${2-}
+        update ${2:-}
         install
         ;;
     *)
@@ -333,6 +334,7 @@ main() {
 }
 
 rm -f /tmp/pimod.log
+touch /tmp/pimod.log
 main "$@" 2>&1 | tee -a /tmp/pimod.log
 mv -f /tmp/pimod.log /var/log/pihole/mod.log
 exit $aborted
diff --git a/advanced/Scripts/speedtestmod/speedtest.sh b/advanced/Scripts/speedtestmod/speedtest.sh
index a5d726840c..3c8ceee445 100755
--- a/advanced/Scripts/speedtestmod/speedtest.sh
+++ b/advanced/Scripts/speedtestmod/speedtest.sh
@@ -17,11 +17,11 @@ share_url text
 );"
 
 speedtest() {
-    if grep -q official <<< "$(/usr/bin/speedtest --version)"; then
+    if grep -q official <<<"$(/usr/bin/speedtest --version)"; then
         if [[ -z "${serverid}" ]]; then
-            /usr/bin/speedtest --accept-gdpr --accept-license -f json-pretty
+            /usr/bin/speedtest --accept-gdpr --accept-license -f json
         else
-            /usr/bin/speedtest -s $serverid --accept-gdpr --accept-license -f json-pretty
+            /usr/bin/speedtest -s $serverid --accept-gdpr --accept-license -f json
         fi
     else
         if [[ -z "${serverid}" ]]; then
@@ -32,82 +32,124 @@ speedtest() {
     fi
 }
 
-internet() {
-    stop=$(date -u --rfc-3339='seconds')
-    res="$(</tmp/speedtest_results)"
-    server_id=$(jq -r '.server.id' <<< "$res")
-    servers="$(curl 'https://www.speedtest.net/api/js/servers' --compressed -H 'Upgrade-Insecure-Requests: 1' -H 'DNT: 1' -H 'Sec-GPC: 1')"
-    server_dist=$(jq --arg id "$server_id" '.[] | select(.id == $id) | .distance' <<< "$servers")
-
-    if grep -q official <<< "$(/usr/bin/speedtest --version)"; then
-        server_name=$(jq -r '.server.name' <<< "$res")
-        download=$(jq -r '.download.bandwidth' <<< "$res" | awk '{$1=$1*8/1000/1000; print $1;}' | sed 's/,/./g')
-        upload=$(jq -r '.upload.bandwidth' <<< "$res" | awk '{$1=$1*8/1000/1000; print $1;}' | sed 's/,/./g')
-        isp=$(jq -r '.isp' <<< "$res")
-        from_ip=$(jq -r '.interface.externalIp' <<< "$res")
-        server_ping=$(jq -r '.ping.latency' <<< "$res")
-        share_url=$(jq -r '.result.url' <<< "$res")
-        if [ -z "$server_dist" ]; then
-            server_dist="-1"
-        fi
-    else
-        server_name=$(jq -r '.server.sponsor' <<< "$res")
-        download=$(jq -r '.download' <<< "$res" | awk '{$1=$1/1000/1000; print $1;}' | sed 's/,/./g')
-        upload=$(jq -r '.upload' <<< "$res" | awk '{$1=$1/1000/1000; print $1;}' | sed 's/,/./g')
-        isp=$(jq -r '.client.isp' <<< "$res")
-        from_ip=$(jq -r '.client.ip' <<< "$res")
-        server_ping=$(jq -r '.ping' <<< "$res")
-        share_url=$(jq -r '.share' <<< "$res")
-        if [ -z "$server_dist" ]; then
-            server_dist=$(jq -r '.server.d' <<< "$res")
-        fi
-    fi
-
-    jq . /tmp/speedtest_results
+savetest() {
+    local start_time=$1
+    local stop_time=$2
+    local isp=${3:-"No Internet"}
+    local from_ip=${4:-"-"}
+    local server=${5:-"-"}
+    local server_dist=${6:-0}
+    local server_ping=${7:-0}
+    local download=${8:-0}
+    local upload=${9:-0}
+    local share_url=${10:-"#"}
     sqlite3 /etc/pihole/speedtest.db "$create_table"
-    sqlite3 /etc/pihole/speedtest.db "insert into speedtest values (NULL, '${start}', '${stop}', '${isp}', '${from_ip}', '${server_name}', ${server_dist}, ${server_ping}, ${download}, ${upload}, '${share_url}');"
-    mv -f "$out" /var/log/pihole/speedtest.log
-    exit 0
+    sqlite3 /etc/pihole/speedtest.db "insert into speedtest values (NULL, '${start_time}', '${stop_time}', '${isp}', '${from_ip}', '${server}', ${server_dist}, ${server_ping}, ${download}, ${upload}, '${share_url}');"
+    mv -f /tmp/speedtest_results /var/log/pihole/speedtest.log
+    cp -af /var/log/pihole/speedtest.log /etc/pihole/speedtest.log
+    rm -f "$out"
+    [ "$isp" == "No Internet" ] && exit 1 || exit 0
 }
 
-nointernet(){
-    stop=$(date -u --rfc-3339='seconds')
-    rm -f /tmp/speedtest_results
-    echo "No Internet"
-    sqlite3 /etc/pihole/speedtest.db "$create_table"
-    sqlite3 /etc/pihole/speedtest.db "insert into speedtest values (NULL, '${start}', '${stop}', 'No Internet', '-', '-', 0, 0, 0, 0, '#');"
-    mv -f "$out" /var/log/pihole/speedtest.log
-    exit 1
+swaptest() {
+    if [ -x "$(command -v apt-get)" ]; then
+        apt-get install -y $1 $2-
+    elif [ -x "$(command -v dnf)" ]; then
+        dnf install -y --allowerasing $1
+    else
+        yum install -y --allowerasing $1
+    fi
 }
 
 notInstalled() {
-    if [ -x "$(command -v yum)" ] || [ -x "$(command -v dnf)" ]; then
-        rpm -q "$1" &>/dev/null || return 0
-    elif [ -x "$(command -v apt-get)" ]; then
+    if [ -x "$(command -v apt-get)" ]; then
         dpkg -s "$1" &>/dev/null || return 0
+    elif [ -x "$(command -v dnf)" ] || [ -x "$(command -v yum)" ]; then
+        rpm -q "$1" &>/dev/null || return 0
     else
         echo "Unsupported package manager!"
         mv -f "$out" /var/log/pihole/speedtest.log
         exit 1
     fi
+
     return 1
 }
 
-tryagain(){
-    if notInstalled speedtest-cli; then
-        if [ -x "$(command -v apt-get)" ]; then
-            apt-get install -y speedtest-cli speedtest-
+run() {
+    speedtest | jq . >/tmp/speedtest_results || echo "Attempt ${2:-1} Failed!" >/tmp/speedtest_results
+    local stop=$(date -u --rfc-3339='seconds')
+    if jq -e '.server.id' /tmp/speedtest_results &>/dev/null; then
+        local res=$(</tmp/speedtest_results)
+        local server_id=$(jq -r '.server.id' <<<"$res")
+        local servers="$(curl 'https://www.speedtest.net/api/js/servers' --compressed -H 'Upgrade-Insecure-Requests: 1' -H 'DNT: 1' -H 'Sec-GPC: 1')"
+        local server_dist=$(jq --arg id "$server_id" '.[] | select(.id == $id) | .distance' <<<"$servers")
+
+        if grep -q official <<<"$(/usr/bin/speedtest --version)"; then
+            local server_name=$(jq -r '.server.name' <<<"$res")
+            local download=$(jq -r '.download.bandwidth' <<<"$res" | awk '{$1=$1*8/1000/1000; print $1;}' | sed 's/,/./g')
+            local upload=$(jq -r '.upload.bandwidth' <<<"$res" | awk '{$1=$1*8/1000/1000; print $1;}' | sed 's/,/./g')
+            local isp=$(jq -r '.isp' <<<"$res")
+            local from_ip=$(jq -r '.interface.externalIp' <<<"$res")
+            local server_ping=$(jq -r '.ping.latency' <<<"$res")
+            local share_url=$(jq -r '.result.url' <<<"$res")
+            if [ -z "$server_dist" ]; then
+                server_dist="-1"
+            fi
         else
-            yum install -y --allowerasing speedtest-cli
+            local server_name=$(jq -r '.server.sponsor' <<<"$res")
+            local download=$(jq -r '.download' <<<"$res" | awk '{$1=$1/1000/1000; print $1;}' | sed 's/,/./g')
+            local upload=$(jq -r '.upload' <<<"$res" | awk '{$1=$1/1000/1000; print $1;}' | sed 's/,/./g')
+            local isp=$(jq -r '.client.isp' <<<"$res")
+            local from_ip=$(jq -r '.client.ip' <<<"$res")
+            local server_ping=$(jq -r '.ping' <<<"$res")
+            local share_url=$(jq -r '.share' <<<"$res")
+            if [ -z "$server_dist" ]; then
+                server_dist=$(jq -r '.server.d' <<<"$res")
+            fi
         fi
+
+        savetest "$start" "$stop" "$isp" "$from_ip" "$server_name" "$server_dist" "$server_ping" "$download" "$upload" "$share_url"
+    elif [ "${1}" == "${2:-}" ] || [ "${1}" -le 1 ]; then
+        echo "Test Failed!" >/tmp/speedtest_results
+        savetest "$start" "$stop"
     else
-        if [ -x "$(command -v apt-get)" ]; then
-            apt-get install -y speedtest speedtest-cli-
+        if notInstalled speedtest; then
+            local PKG_MANAGER=$(command -v apt-get || command -v dnf || command -v yum)
+            if [[ "$PKG_MANAGER" == *"yum"* || "$PKG_MANAGER" == *"dnf"* ]]; then
+                if [ ! -f /etc/yum.repos.d/ookla_speedtest-cli.repo ]; then
+                    echo "Adding speedtest source for RPM..."
+                    curl -sSLN https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.rpm.sh | sudo bash
+                fi
+            elif [[ "$PKG_MANAGER" == *"apt-get"* ]]; then
+                if [ ! -f /etc/apt/sources.list.d/ookla_speedtest-cli.list ]; then
+                    echo "Adding speedtest source for DEB..."
+                    if [ -e /etc/os-release ]; then
+                        . /etc/os-release
+                        local base="ubuntu debian"
+                        local os=${ID}
+                        local dist=${VERSION_CODENAME}
+                        if [ ! -z "${ID_LIKE-}" ] && [[ "${base//\"/}" =~ "${ID_LIKE//\"/}" ]] && [ "${os}" != "ubuntu" ]; then
+                            os=${ID_LIKE%% *}
+                            [ -z "${UBUNTU_CODENAME-}" ] && UBUNTU_CODENAME=$(/usr/bin/lsb_release -cs)
+                            dist=${UBUNTU_CODENAME}
+                            [ -z "$dist" ] && dist=${VERSION_CODENAME}
+                        fi
+                        wget -O /tmp/script.deb.sh https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh >/dev/null 2>&1
+                        chmod +x /tmp/script.deb.sh
+                        os=$os dist=$dist /tmp/script.deb.sh
+                        rm -f /tmp/script.deb.sh
+                    else
+                        curl -sSLN https://packagecloud.io/install/repositories/ookla/speedtest-cli/script.deb.sh | sudo bash
+                    fi
+                fi
+            fi
+            swaptest speedtest speedtest-cli
         else
-            yum install -y --allowerasing speedtest
+            swaptest speedtest-cli speedtest
         fi
+
+        run $1 $((${2:-1} + 1))
     fi
-    speedtest > /tmp/speedtest_results && internet || nointernet
 }
 
 main() {
@@ -115,9 +157,9 @@ main() {
         sudo "$0" "$@"
         exit $?
     fi
-    echo "Test has been initiated, please wait..."
-    speedtest > /tmp/speedtest_results && internet || tryagain
+
+    echo "Running Test..."
+    run $1 # Number of attempts
 }
 
-rm -f "$out"
-main | tee -a "$out"
+main ${1:-3} >"$out"
diff --git a/advanced/Scripts/webpage.sh b/advanced/Scripts/webpage.sh
index 6042c04a29..14b8341ecb 100755
--- a/advanced/Scripts/webpage.sh
+++ b/advanced/Scripts/webpage.sh
@@ -651,7 +651,6 @@ EOF
     if [[ "$total_seconds" == "nan" ]] || (( $(echo "$total_seconds > 0" | bc -l) )); then
         crontab -l &> /dev/null || crontab -l 2>/dev/null | { cat; echo ""; } | crontab -
         (crontab -l; echo "* * * * * /bin/bash $schedule_script") | crontab -
-        sudo bash -c "$schedule_script"
     fi
 }
 
@@ -660,8 +659,9 @@ ChangeSpeedTestSchedule() {
     if [[ "${interval-}" =~ ^-?([0-9]+(\.[0-9]*)?|\.[0-9]+)$ ]]; then
         if (( $(echo "$interval < 0" | bc -l) )); then
             interval="0"
+        else
+            addOrEditKeyValPair "${setupVars}" "SPEEDTESTSCHEDULE" "$interval"
         fi
-        addOrEditKeyValPair "${setupVars}" "SPEEDTESTSCHEDULE" "$interval"
     else
         interval=$(grep "SPEEDTESTSCHEDULE" "${setupVars}" | cut -f2 -d"=")
         if [[ ! "${interval-}" =~ ^([0-9]+(\.[0-9]*)?|\.[0-9]+)$ ]]; then