diff --git a/webif/include/restart.jim b/webif/include/restart.jim
index 68d448a..1ede988 100755
--- a/webif/include/restart.jim
+++ b/webif/include/restart.jim
@@ -1,9 +1,10 @@
 #!/mod/bin/jimsh
 
+source /mod/webif/lib/setup
+require system.class
 set class "class=hidden"
-if {[file exists /tmp/.restartpending]} {
-	source /mod/webif/lib/setup
-	require system.class rsv.class
+if {[system isrestartpending]} {
+	require rsv.class
 	if {[rsv count pending] <= 0} {
 		system restartpending 0
 	} else {
diff --git a/webif/lib/system.class b/webif/lib/system.class
index 71fbc3e..140121f 100644
--- a/webif/lib/system.class
+++ b/webif/lib/system.class
@@ -554,6 +554,10 @@ proc {system reboot} {{fast 0}} {
 	}
 }
 
+proc {system isrestartpending} {} {
+	return [file exists /tmp/.restartpending]
+}
+
 proc {system restartpending} {{mode 1}} {
 	if {$mode} {
 		close [open /tmp/.restartpending w]