diff --git a/data/hostserv.example.conf b/data/hostserv.example.conf
index e1275cc7a..1869c5eb9 100644
--- a/data/hostserv.example.conf
+++ b/data/hostserv.example.conf
@@ -80,6 +80,11 @@ module
 	 * If enabled, vhosts are activated on users immediately when they are set.
 	 */
 	activate_on_set = false
+
+	/*
+	 * If enabled, vhosts are activated on users immediately when they log out of an operator account.
+	 */
+	activate_on_deoper = yes
 }
 
 /*
diff --git a/modules/hostserv/hostserv.cpp b/modules/hostserv/hostserv.cpp
index 39b49ec29..82273f4e5 100644
--- a/modules/hostserv/hostserv.cpp
+++ b/modules/hostserv/hostserv.cpp
@@ -79,6 +79,12 @@ public:
 		this->OnUserLogin(u);
 	}
 
+	void OnUserModeUnset(const MessageSource &setter, User *u, const Anope::string &mname) override
+	{
+		if (mname == "OPER" && Config->GetModule(this)->Get<bool>("activate_on_deoper", "yes"))
+			this->OnUserLogin(u);
+	}
+
 	EventReturn OnPreHelp(CommandSource &source, const std::vector<Anope::string> &params) override
 	{
 		if (!params.empty() || source.c || source.service != *HostServ)