diff --git a/server/api/user.py b/server/api/user.py
index 9a9acbf..9ef4e7d 100644
--- a/server/api/user.py
+++ b/server/api/user.py
@@ -132,7 +132,7 @@ def user_status():
 		"success": 1,
 		"logged_in": logged_in,
 		"admin": is_admin(),
-		"competition": is_admin(),
+		"competition": utils.is_ctf_time(),
 		"in_team": in_team(get_user().first()),
 		"username": session["username"] if logged_in else "",
 	}
diff --git a/server/api/utils.py b/server/api/utils.py
index 3c64f0f..bcdf9b7 100644
--- a/server/api/utils.py
+++ b/server/api/utils.py
@@ -100,3 +100,19 @@ def generate_identicon(email, filename):
 
 	image.save(open("pfp/%s.png" % filename, "w"), "PNG")
 	return
+
+def is_ctf_time():
+	import settings
+	start = settings.get("ctf_begin")
+	end = settings.get("ctf_end")
+	start = [int(start), 0][start is None]
+	end = [int(end), 0][end is None]
+	time = get_time_since_epoch()
+
+	if start and end:
+		return start < time < end
+
+	if start < time and end == 0:
+		return True
+
+	return False
diff --git a/web/index.html b/web/index.html
index de8ae3f..f9e86e4 100644
--- a/web/index.html
+++ b/web/index.html
@@ -50,10 +50,10 @@
 					<li><a href="/login">Login</a></li>
 				</ul>
 				<ul class="nav navbar-nav navbar-right" ng-show="config.navbar['logged_in']==true">
-					<div ng-show="config.navbar['competition_started']==true">
+					<div ng-show="config.navbar['competition']==true">
 					</div>
 					<li><a href="/chat">Chat</a></li>
-					<li class="dropdown" ng-show="config.navbar['competition']==true">
+					<li class="dropdown" ng-show="config.navbar['competition']==true||config.navbar['admin']==true">
 						<a href="javascript:void(0);" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Competition <span class="caret"></span></a>
 						<ul class="dropdown-menu">
 							<li><a href="/problems">Problems</a></li>
diff --git a/web/pages/admin/settings.html b/web/pages/admin/settings.html
index 712497e..caa95b7 100644
--- a/web/pages/admin/settings.html
+++ b/web/pages/admin/settings.html
@@ -3,9 +3,9 @@
 	<div ng-if="settings">
 		<div id="settings_msg"/>
 		<form class="form-horizontal" onsubmit="update_settings(); return false;" id="update_settings_form">
-			<input class="form-control" name="ctf_begin" value="{{ settings['ctf_begin'] }}"/>
+			<input class="form-control" name="ctf_begin" placeholder="CTF Start time (seconds)" value="{{ settings['ctf_begin'] }}" required/>
 			<br>
-			<input class="form-control" name="ctf_end" value="{{ settings['ctf_end'] }}"/>
+			<input class="form-control" name="ctf_end" placeholder="CTF End time (seconds)" value="{{ settings['ctf_end'] }}"required/>
 			<br>
 			<input type="submit" class="btn btn-success" value="Update"/>
 		</form>