diff --git a/app/qrwebform.py b/app/qrwebform.py
index d2ca830..d48806b 100755
--- a/app/qrwebform.py
+++ b/app/qrwebform.py
@@ -2,7 +2,8 @@
 
 from flask import Flask, render_template, flash, request
 from flask_wtf import FlaskForm
-from wtforms import Form, TextField, BooleanField
+from wtforms import Form, BooleanField, SubmitField, TextField
+from wtforms.validators import DataRequired
 import os
 
 DEBUG = False
@@ -11,8 +12,9 @@ app.config.from_object(__name__)
 app.config['SECRET_KEY'] = os.urandom(40)
 
 class QRForm(FlaskForm):
-    user_data = TextField("Dane:")
+    user_data = TextField("Dane:", validators=[DataRequired()])
     trim_spaces = BooleanField("Usuń spacje", default=True)
+    submit = SubmitField("Generuj")
 
     @app.route("/", methods=["GET", "POST"])
     def main():
diff --git a/app/templates/main.html b/app/templates/main.html
index c36828b..cf1cd00 100644
--- a/app/templates/main.html
+++ b/app/templates/main.html
@@ -16,7 +16,7 @@
 	<div> {{ form.user_data }} </div>
 	<div class="input submit">
 		{{ form.trim_spaces(checked=True) }} {{ form.trim_spaces.label }}
-		<input type="submit" value="Generate"</div>
+		{{ form.submit }} </div>
 </form>
 </p>