diff --git a/src/memberdb/account.py b/src/memberdb/account.py
index e94039e42f09f8634d123776a6d127d7126789a4..a2fa0ee957b5aff4e5982ca8ffe3247ee5770416 100644
--- a/src/memberdb/account.py
+++ b/src/memberdb/account.py
@@ -64,6 +64,8 @@ class EmailForm(MyModelForm):
 	def clean(self):
 		if self['forward'].value() == True:
 			try:
+				if (len(self['email_address'].value()) == 0):
+					self.add_error('email_address', 'Email field cannot be left blankL.')
 				if (self['email_address'].value().split('@')[1] in ["ucc.asn.au", "ucc.gu.uwa.edu.au"]):
 					self.add_error('email_address', 'Forwarding address cannot be the same as your account address.')
 			except:
@@ -76,12 +78,14 @@ class DispenseForm(MyForm):
 		max_length=4, 
 		widget=forms.PasswordInput, 
 		strip=False,
+		required=False,
 		help_text="PIN must be 4 digits long") 
 
 	confirm_pin = forms.CharField(
 		min_length=0, 
 		max_length=4, 
 		widget=forms.PasswordInput,
+		required=False,
 		strip=False,
 	)
 	def clean(self):
diff --git a/src/templates/admin/memberdb/account_create.html b/src/templates/admin/memberdb/account_create.html
index bd13750cba83724f31e2559e17499a70be50eb71..0f76d5153c02d8a373a3863348279c05a8293ee6 100644
--- a/src/templates/admin/memberdb/account_create.html
+++ b/src/templates/admin/memberdb/account_create.html
@@ -44,7 +44,7 @@
 	</fieldset>
 	<div class="submit-row">
 	  {% if wizard.steps.prev %}
-		<button name="wizard_goto_step" type="submit" value="{{ wizard.steps.prev }}"> prev </button>
+		<button name="wizard_goto_step" class="button" type="submit" value="{{ wizard.steps.prev }}"> prev </button>
 	 {% endif %}
 	  
 	{% if wizard.steps.next %}
@@ -60,4 +60,4 @@
 </form>
 </div>
 
-{% endblock %}
\ No newline at end of file
+{% endblock %}