diff --git a/templates/mixins/form/account.pug b/templates/mixins/form/account.pug
index 51066f04..8c1b6d49 100644
--- a/templates/mixins/form/account.pug
+++ b/templates/mixins/form/account.pug
@@ -12,14 +12,12 @@ mixin username
.form-group.has-feedback
label Username:
.input-group
- // TODO: Add back 'data-remote="/account/checkUsername", data-remote-error="Username taken"' to input check once API is fixed
- input(type='text', name='username', required='required', value=formData['username'], data-minlength='3', maxlength='16', pattern='[A-Za-z]{1}[A-Za-z0-9_-]{2,15}$', data-minlength-error='The username is too short - must be at least 3 characters', data-error='Please check username requirements').form-control
+ input(type='text', name='username', required='required', value=formData['username'], data-minlength='3', maxlength='16', pattern='[A-Za-z]{1}[A-Za-z0-9_-]{2,15}$', data-minlength-error='The username is too short - must be at least 3 characters', data-error='Please check username requirements', data-remote="/account/checkUsername", data-remote-error="Username taken").form-control
span(aria-hidden='true').glyphicon.form-control-feedback
.help-block
| Must be between 3 and 16 characters
| Only letters, digits, minus and underscore are allowed
| First character must be a letter
- | Error will occur if username is already taken
.help-block.with-errors
mixin usernameOrEmail