diff --git a/include/usermanager.h b/include/usermanager.h
index bf9567d43..681c5e059 100644
--- a/include/usermanager.h
+++ b/include/usermanager.h
@@ -141,6 +141,9 @@ class CoreExport UserManager : public fakederef<UserManager>
 	 */
 	void RehashCloneCounts();
 
+	/** Rebuilds the list of services servers. Required when \<uline> settings change. */
+	void RehashULines();
+
 	/** Return the number of local and global clones of this user
 	 * @param user The user to get the clone counts for
 	 * @return The clone counts of this user. The returned reference is volatile - you
diff --git a/src/configreader.cpp b/src/configreader.cpp
index d1b55a113..f5f9f1ce8 100644
--- a/src/configreader.cpp
+++ b/src/configreader.cpp
@@ -733,6 +733,7 @@ void ConfigReaderThread::Finish()
 		ServerInstance->FakeClient->server->description = Config->ServerDesc;
 
 		ServerInstance->ISupport.Build();
+		ServerInstance->Users.RehashULines();
 
 		ServerInstance->Logs->CloseLogs();
 		ServerInstance->Logs->OpenFileLogs();
diff --git a/src/usermanager.cpp b/src/usermanager.cpp
index d410131f4..c20609a2c 100644
--- a/src/usermanager.cpp
+++ b/src/usermanager.cpp
@@ -353,6 +353,19 @@ void UserManager::RehashCloneCounts()
 	}
 }
 
+void UserManager::RehashULines()
+{
+	UserManager::ULineList newulines;
+	const user_hash& users = ServerInstance->Users.GetUsers();
+	for (user_hash::const_iterator i = users.begin(); i != users.end(); ++i)
+	{
+		User* user = i->second;
+		if (user->server->IsULine())
+			newulines.push_back(user);
+	}
+	std::swap(ServerInstance->Users.all_ulines, newulines);
+}
+
 const UserManager::CloneCounts& UserManager::GetCloneCounts(User* user) const
 {
 	CloneMap::const_iterator it = clonemap.find(user->GetCIDRMask());