diff --git a/lib/model/model.go b/lib/model/model.go
index 6d9d0b3b8..2ca41467a 100644
--- a/lib/model/model.go
+++ b/lib/model/model.go
@@ -1959,7 +1959,16 @@ func (m *Model) CommitConfiguration(from, to config.Configuration) bool {
 		}
 	}
 
-	// All of the generic options require restart
+	// Some options don't require restart as those components handle it fine
+	// by themselves.
+	from.Options.URAccepted = to.Options.URAccepted
+	from.Options.URUniqueID = to.Options.URUniqueID
+	// All of the other generic options require restart. Or at least they may;
+	// removing this check requires going through those options carefully and
+	// making sure there are individual services that handle them correctly.
+	// This code is the "original" requires-restart check and protects other
+	// components that haven't yet been converted to VerifyConfig/CommitConfig
+	// handling.
 	if !reflect.DeepEqual(from.Options, to.Options) {
 		l.Debugln(m, "requires restart, options differ")
 		return false