diff --git a/main/SAPI.c b/main/SAPI.c
index 2efce069da9d..40d3e20fdc96 100644
--- a/main/SAPI.c
+++ b/main/SAPI.c
@@ -521,9 +521,12 @@ SAPI_API void sapi_deactivate_module(void)
 	}
 	if (SG(request_info).content_type_dup) {
 		efree(SG(request_info).content_type_dup);
+		SG(request_info).content_type_dup = NULL;
 	}
 	if (SG(request_info).current_user) {
 		efree(SG(request_info).current_user);
+		SG(request_info).current_user = NULL;
+		SG(request_info).current_user_length = 0;
 	}
 	if (sapi_module.deactivate) {
 		sapi_module.deactivate();