diff --git a/modules/nickserv/ns_set_timezone.cpp b/modules/nickserv/ns_set_timezone.cpp
index a42990599..f133af7e8 100644
--- a/modules/nickserv/ns_set_timezone.cpp
+++ b/modules/nickserv/ns_set_timezone.cpp
@@ -105,6 +105,8 @@ public:
 			}
 
 			usertz = timezone;
+			if (usertz.equals_ci(param))
+				break; // Exact match.
 		}
 
 		if (usertz.empty())
diff --git a/src/misc.cpp b/src/misc.cpp
index 99663df01..a428f2f7f 100644
--- a/src/misc.cpp
+++ b/src/misc.cpp
@@ -634,6 +634,7 @@ Anope::string Anope::strftime(time_t t, const NickCore *nc, bool short_output)
 	if (nc)
 	{
 		unsetenv("TZ");
+		tzset();
 		Language::ResetLocale();
 	}