diff --git a/app/main/dao/services_dao.py b/app/main/dao/services_dao.py
index dff0e3a68..9881d6689 100644
--- a/app/main/dao/services_dao.py
+++ b/app/main/dao/services_dao.py
@@ -10,14 +10,10 @@ def insert_new_service(service_name, user):
                       limit=1000,
                       active=False,
                       restricted=True)
-    try:
-        add_service(service)
-        service.users.append(user)
-        db.session.commit()
-        return service.id
-    except Exception as e:
-        print(e)
-        raise e
+    add_service(service)
+    service.users.append(user)
+    db.session.commit()
+    return service.id
 
 
 def get_service_by_id(id):
diff --git a/app/templates/views/add-service.html b/app/templates/views/add-service.html
index 130247a0d..3b50f3371 100644
--- a/app/templates/views/add-service.html
+++ b/app/templates/views/add-service.html
@@ -16,15 +16,17 @@ GOV.UK Notify | Set up service
 				<li>as your email sender name</li>
 			</ul>
 
-		<p>
-		<label class="form-label" for="emailverify">Service name</label>
-  		<input class="form-control" id="emailverify" type="text"><br>
-  		<span class="font-xsmall">For example, 'Vehicle tax' or 'Carer's allowance'</span>
-  		</p>
+		<form autocomplete="off" action="" method="post">
+			{{ form.hidden_tag() }}
+			<label class="form-label">Service name</label>
+			{{ form.service_name(class="form-control-2-3", autocomplete="off") }} <br>
+			<span class="font-xsmall">For example, 'Vehicle tax' or 'Carer's allowance'</span>
 
-  		<p>
-  		<a class="button" href="dashboard" role="button">Continue</a>
-  		</p>
+			<p>
+			<button class="button" href="dashboard" role="button">Continue</button>
+			</p>
+		</form>
+		</div>
 	</div>
 </div>