Index: lams_admin/conf/language/lams/ApplicationResources.properties
===================================================================
diff -u -r098532cd2b5687da032408b04a1120dab668083b -r04f70c56cf4d63d83a332402a572c9062f318bbf
--- lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 098532cd2b5687da032408b04a1120dab668083b)
+++ lams_admin/conf/language/lams/ApplicationResources.properties	(.../ApplicationResources.properties)	(revision 04f70c56cf4d63d83a332402a572c9062f318bbf)
@@ -421,6 +421,8 @@
 admin.group  =Course
 admin.lessons  =Add to lessons?
 admin.staff  =Add as staff/monitor?
+admin.email.verify =Require email verification?
+admin.email.verify.desc =(a verification email will be send before user can log in for the first time)
 admin.course.key  =Course Key
 admin.confirm.course.key  =Confirm course key
 admin.description.txt  =Description
Index: lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java
===================================================================
diff -u -rc92ea51a973dc03ece970c057dd9369eda6a8c24 -r04f70c56cf4d63d83a332402a572c9062f318bbf
--- lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java	(.../SignupManagementAction.java)	(revision c92ea51a973dc03ece970c057dd9369eda6a8c24)
+++ lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java	(.../SignupManagementAction.java)	(revision 04f70c56cf4d63d83a332402a572c9062f318bbf)
@@ -91,6 +91,7 @@
 		signupForm.set("addAsStaff", signup.getAddAsStaff());
 		signupForm.set("addWithAuthor", signup.getAddWithAuthor());
 		signupForm.set("addWithMonitor", signup.getAddWithMonitor());
+		signupForm.set("emailVerify", signup.getEmailVerify());
 		signupForm.set("courseKey", signup.getCourseKey());
 		signupForm.set("blurb", signup.getBlurb());
 		signupForm.set("disabled", signup.getDisabled());
@@ -143,6 +144,7 @@
 		signup.setAddAsStaff((Boolean) signupForm.get("addAsStaff"));
 		signup.setAddWithAuthor((Boolean) signupForm.get("addWithAuthor"));
 		signup.setAddWithMonitor((Boolean) signupForm.get("addWithMonitor"));
+		signup.setEmailVerify((Boolean) signupForm.get("emailVerify"));
 		signup.setDisabled((Boolean) signupForm.get("disabled"));
 		signup.setLoginTabActive((Boolean) signupForm.get("loginTabActive"));
 		signup.setOrganisation((Organisation) userManagementService.findById(Organisation.class,
Index: lams_admin/web/WEB-INF/struts-config.xml
===================================================================
diff -u -r68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f -r04f70c56cf4d63d83a332402a572c9062f318bbf
--- lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 68f6bb788ddb8f2df61d1a2437a9d7db8d6a846f)
+++ lams_admin/web/WEB-INF/struts-config.xml	(.../struts-config.xml)	(revision 04f70c56cf4d63d83a332402a572c9062f318bbf)
@@ -151,6 +151,7 @@
 	<form-property name="addAsStaff" type="java.lang.Boolean" initial="0" />
 	<form-property name="addWithAuthor" type="java.lang.Boolean" initial="0" />
 	<form-property name="addWithMonitor" type="java.lang.Boolean" initial="0" />
+	<form-property name="emailVerify" type="java.lang.Boolean" initial="0" />
 	<form-property name="courseKey" type="java.lang.String" />
 	<form-property name="confirmCourseKey" type="java.lang.String" />
 	<form-property name="blurb" type="java.lang.String" />
Index: lams_admin/web/css/admin.scss
===================================================================
diff -u -ra83b0eec89979dce7415b02afdda324b14018dbb -r04f70c56cf4d63d83a332402a572c9062f318bbf
--- lams_admin/web/css/admin.scss	(.../admin.scss)	(revision a83b0eec89979dce7415b02afdda324b14018dbb)
+++ lams_admin/web/css/admin.scss	(.../admin.scss)	(revision 04f70c56cf4d63d83a332402a572c9062f318bbf)
@@ -1 +1,5 @@
+@import "_lams_variables.scss";
+
+.signupFieldDescription {
+	color: lighten($gray-base, 50%);
+}
\ No newline at end of file
Index: lams_admin/web/signupmanagement/add.jsp
===================================================================
diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -r04f70c56cf4d63d83a332402a572c9062f318bbf
--- lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
+++ lams_admin/web/signupmanagement/add.jsp	(.../add.jsp)	(revision 04f70c56cf4d63d83a332402a572c9062f318bbf)
@@ -32,6 +32,12 @@
 			<td></td>
 		</tr>
 		<tr>
+			<td><fmt:message key="admin.email.verify" />:</td>
+			<td colspan="2"><html:checkbox property="emailVerify" />&nbsp;&nbsp;
+				<span class="signupFieldDescription"><fmt:message key="admin.email.verify.desc" /></span>
+			</td>
+		</tr>
+		<tr>
 			<td colspan="2"><html:errors property="courseKey" /></td>
 		</tr>
 		<tr>
Index: lams_admin/web/signupmanagement/list.jsp
===================================================================
diff -u -radd7948dbdf9451fb5bb7839e22d2f22ca8b54f1 -r04f70c56cf4d63d83a332402a572c9062f318bbf
--- lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision add7948dbdf9451fb5bb7839e22d2f22ca8b54f1)
+++ lams_admin/web/signupmanagement/list.jsp	(.../list.jsp)	(revision 04f70c56cf4d63d83a332402a572c9062f318bbf)
@@ -15,6 +15,7 @@
 		<th><fmt:message key="admin.group.code" /></th>
 		<th><fmt:message key="admin.lessons" /></th>
 		<th><fmt:message key="admin.staff" /></th>
+		<th><fmt:message key="admin.email.verify" /></th>
 		<th><fmt:message key="admin.added.on"/></th>
 		<th><fmt:message key="admin.disable.option"/></th>
 		<th><fmt:message key="admin.context.path"/></th>
@@ -35,6 +36,9 @@
 				<c:out value="${signupOrganisation.addAsStaff}" />
 			</td>
 			<td>
+				<c:out value="${signupOrganisation.emailVerify}" />
+			</td>
+			<td>
 				<c:out value="${signupOrganisation.createDate}" />
 			</td>
 			<td>
Index: lams_build/lib/lams/lams.jar
===================================================================
diff -u -r28360b21c9f90c01d1d615a9c77c5f651e789469 -r04f70c56cf4d63d83a332402a572c9062f318bbf
Binary files differ
Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml
===================================================================
diff -u -r8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0 -r04f70c56cf4d63d83a332402a572c9062f318bbf
--- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml	(.../SignupOrganisation.hbm.xml)	(revision 8620cb3f29c4710a0ddfd597fdc1b676d4b2b4b0)
+++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/signup/model/SignupOrganisation.hbm.xml	(.../SignupOrganisation.hbm.xml)	(revision 04f70c56cf4d63d83a332402a572c9062f318bbf)
@@ -73,6 +73,15 @@
             column="add_with_monitor"
             length="1"
         />
+        
+        <property
+            name="emailVerify"
+            type="java.lang.Boolean"
+            update="true"
+            insert="true"
+            column="email_verify"
+            length="1"
+        />
 
         <property
             name="courseKey"
Index: lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180717.sql
===================================================================
diff -u
--- lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180717.sql	(revision 0)
+++ lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180717.sql	(revision 04f70c56cf4d63d83a332402a572c9062f318bbf)
@@ -0,0 +1,15 @@
+-- Turn off autocommit, so nothing is committed if there is an error
+SET AUTOCOMMIT = 0;
+SET FOREIGN_KEY_CHECKS=0;
+----------------------Put all sql statements below here-------------------------
+
+-- LDEV-4617 Add column for email verification
+ALTER TABLE lams_signup_organisation ADD COLUMN email_verify TINYINT(1) DEFAULT 0 AFTER add_with_monitor;
+ALTER TABLE lams_user ADD COLUMN email_verified TINYINT(1) DEFAULT 1 AFTER email;
+
+----------------------Put all sql statements above here-------------------------
+
+-- If there were no errors, commit and restore autocommit to on
+COMMIT;
+SET AUTOCOMMIT = 1;
+SET FOREIGN_KEY_CHECKS=1;
\ No newline at end of file
Index: lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java
===================================================================
diff -u -r5773f84ed608838de3521ecde87c52f3c72d478c -r04f70c56cf4d63d83a332402a572c9062f318bbf
--- lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java	(.../SignupOrganisation.java)	(revision 5773f84ed608838de3521ecde87c52f3c72d478c)
+++ lams_common/src/java/org/lamsfoundation/lams/signup/model/SignupOrganisation.java	(.../SignupOrganisation.java)	(revision 04f70c56cf4d63d83a332402a572c9062f318bbf)
@@ -21,6 +21,7 @@
     private Boolean addAsStaff;
     private Boolean addWithAuthor;
     private Boolean addWithMonitor;
+    private Boolean emailVerify;
     private String courseKey;
     private String blurb;
     private Date createDate;
@@ -76,6 +77,14 @@
 	this.addWithMonitor = addWithMonitor;
     }
 
+    public Boolean getEmailVerify() {
+	return emailVerify;
+    }
+
+    public void setEmailVerify(Boolean emailValidation) {
+	this.emailVerify = emailValidation;
+    }
+
     public String getCourseKey() {
 	return courseKey;
     }