diff --git a/templates/diary.html b/templates/diary.html
index d392c2d..f3462e4 100644
--- a/templates/diary.html
+++ b/templates/diary.html
@@ -19,7 +19,7 @@
 			<div id="contentContainer">
 				<form action="{{ url_for('addentry',name=diary.name) }}" method="POST">
 					Add new entry:<br />
-					<textarea name="text" style="width:99%;height:150px;"></textarea><br/>
+					<textarea name="text" style="width:99%;height:150px;" required></textarea><br/>
 					<input type="submit">
 				</form>
 				<div id="listing">
diff --git a/templates/index.html b/templates/index.html
index 1fa0b40..e124c6b 100644
--- a/templates/index.html
+++ b/templates/index.html
@@ -29,7 +29,7 @@
 					{% endfor %}
 				</div>
 				<form method="post" action="{{ url_for('newdiary')}}">
-					You can add a new diary, if you want: <input type="text" name="name" placeholder="name of diary"><input type="submit">
+					You can add a new diary, if you want: <input type="text" name="name" placeholder="name of diary" required><input type="submit">
 				</form>
 			</div>
 		<div>
diff --git a/templates/login.html b/templates/login.html
index 8a6d46e..70bd46b 100644
--- a/templates/login.html
+++ b/templates/login.html
@@ -14,8 +14,8 @@
 			</div>
 			<div id="contentContainer">
 				<form method="POST">
-					<input type="text" name="user" placeholder="Username"/><br/>
-					<input type="password" name="pass" placeholder="Password"/><br/>
+					<input type="text" name="user" placeholder="Username" required/><br/>
+					<input type="password" name="pass" placeholder="Password" required/><br/>
 					<input type="submit" value="Login">
 				</form>
 			</div>