diff --git a/forms.py b/forms.py
index eecb3d9..bd58dc5 100644
--- a/forms.py
+++ b/forms.py
@@ -3,8 +3,7 @@ import pymysql
 import os
 from app import app
 from flask_wtf import FlaskForm
-from wtforms import BooleanField, StringField, PasswordField, TextField, IntegerField, TextAreaField, SubmitField, RadioField, SelectField
-from wtforms.fields.html5 import DateField
+from wtforms import BooleanField, StringField, PasswordField, IntegerField, TextAreaField, SubmitField, RadioField, SelectField, DateField
 from wtforms_components import read_only
 from wtforms import validators, ValidationError
 from wtforms.validators import InputRequired, Email, Length
@@ -27,24 +26,24 @@ class RegisterForm(FlaskForm):
 class addPlayerForm(FlaskForm):
     playerClub = SelectField('Club:', choices=[])
     playerTeam = SelectField('Team:', choices=[])
-    playerForenames = TextField('Forenames:')
-    playerSurnames = TextField('Surname:')
-    playerNickname = TextField('Nickname')
-    playerChineseName = TextField('Chinese Name:')
-    playerEmailAddress = TextField('Email Address:')
+    playerForenames = StringField('Forenames:')
+    playerSurnames = StringField('Surname:')
+    playerNickname = StringField('Nickname')
+    playerChineseName = StringField('Chinese Name:')
+    playerEmailAddress = StringField('Email Address:')
     playerDob = DateField('Date of Birth:', default=datetime.today, format='%Y-%m-%d')
-    playerHkid = TextField('HKID Number:')
-    playerNumber = TextField('Shirt Number:')
-    playerTelNumber = TextField('Player Contact Number:')
+    playerHkid = StringField('HKID Number:')
+    playerNumber = StringField('Shirt Number:')
+    playerTelNumber = StringField('Player Contact Number:')
     submit = SubmitField('Submit')
 
 class addTeamForm(FlaskForm):
     clubName = SelectField("Club of team entry to create", coerce=str)
-    teamName = TextField("Team table to create (e.g. A, B, C, etc.)", validators=[InputRequired(), Length(max=1)])
+    teamName = StringField("Team table to create (e.g. A, B, C, etc.)", validators=[InputRequired(), Length(max=1)])
     submit = SubmitField("Submit")
 
 class addClubForm(FlaskForm):
-    clubName = TextField("Name of the Hockey Club to add")
+    clubName = StringField("Name of the Hockey Club to add")
     submit = SubmitField("Submit")
 
 class playerDbCreateForm(FlaskForm):
diff --git a/motm_app/forms.py b/motm_app/forms.py
index 054fb98..863312d 100644
--- a/motm_app/forms.py
+++ b/motm_app/forms.py
@@ -1,7 +1,6 @@
 # encoding=utf-8
 from flask_wtf import FlaskForm
-from wtforms import BooleanField, StringField, PasswordField, TextField, IntegerField, TextAreaField, SubmitField, RadioField, SelectField
-from wtforms.fields.html5 import DateField
+from wtforms import BooleanField, StringField, PasswordField, IntegerField, TextAreaField, SubmitField, RadioField, SelectField, DateField
 from wtforms_components import read_only
 from wtforms import validators, ValidationError
 from wtforms.validators import InputRequired, Email, Length
@@ -20,8 +19,8 @@ class motmAdminForm(FlaskForm):
 
 class adminSettingsForm2(FlaskForm):
     nextMatch = SelectField('Fixture', choices=[])
-    nextOppoClub = TextField('Next Opposition Club:')
-    nextOppoTeam = TextField("Next Opposition Team:")
+    nextOppoClub = StringField('Next Opposition Club:')
+    nextOppoTeam = StringField("Next Opposition Team:")
     currMotM = SelectField('Current Man of the Match:', choices=[])
     currDotD = SelectField('Current Dick of the Day:', choices=[])
     saveButton = SubmitField('Save Settings')
@@ -29,12 +28,12 @@ class adminSettingsForm2(FlaskForm):
 
 
 class goalsAssistsForm(FlaskForm):
-    fixtureNumber = TextField('Fixture Number')
+    fixtureNumber = StringField('Fixture Number')
     match = SelectField('Fixture')
-    homeTeam = TextField('Home Team')
-    awayTeam = TextField('Away Team')
-    playerNumber = TextField('Player Number')
-    playerName = TextField('Player Name')
+    homeTeam = StringField('Home Team')
+    awayTeam = StringField('Away Team')
+    playerNumber = StringField('Player Number')
+    playerName = StringField('Player Name')
     assists = SelectField('Assists:', choices=[(0, '0'), (1, '1'), (2, '2'), (3, '3'), (4, '4')])
     goals = SelectField('Goals:', choices=[(0, '0'), (1, '1'), (2, '2'), (3, '3'), (4, '4')])
     submit = SubmitField('Submit')