diff --git a/templates/js/controllers/registerController.js b/templates/js/controllers/registerController.js
index c8cadcf..5c5e7b0 100644
--- a/templates/js/controllers/registerController.js
+++ b/templates/js/controllers/registerController.js
@@ -1,45 +1,39 @@
 angular.module('SeHub')
-.controller('registerController', ['$scope', '$location', '$cookies', 'apiService', '$rootScope', function ($scope, $location, $cookies, apiService ,$rootScope) {
+.controller('registerController', ['$scope', '$cookies', '$location', '$mdToast', '$mdDialog', 'apiService', '$rootScope', function ($scope, $cookies, $location, $mdToast, $mdDialog, apiService ,$rootScope)
+{
 	
 	$scope.userHasNoName = false;
 	$scope.campusChecked = false;
 	$scope.isEmpty = true; // if the academic email line is empty
-	// $scope.fullMail = $scope.academicEmail + $scope.campusObj.email_ending; // Will hold the full academic email of the user
 
 	$rootScope.seToken = $cookies['com.sehub.www'];
 	var token = $rootScope.seToken;
 
-	apiService.getUserByToken(token).success(function(data){
+	apiService.getUserByToken(token).success(function(data) // Get user token
+	{
 		$scope.user = data;
-				console.log(data);
+		
 		if(data.message == 'No User Found')
 			console.error("No User Found!");
+		console.log(data);
 
-		$scope.user = data;
-		$rootScope.user = data;
-		if($scope.user.isFirstLogin)
-			$location.path('/register')
-
-
-		if($scope.user.name === ";"){
+		if($scope.user.name === ";")
+		{
 			$scope.user.name = "";
 			$scope.user.name = $scope.user.username
 			$scope.userHasNoName = true;
 		}
 
-	apiService.getAllCampuses($scope.user.seToken).success(function(data)
-	{
-		$scope.campuses = data;
-	}).error(function()
-	{
-		// TODO
-	});
+		apiService.getAllCampuses($scope.user.seToken).success(function(data) // Get all the campuses
+		{
+			$scope.campuses = data;
+		}).error(function()
+		{
+			// TODO
+		});
 
 	});
 
-
-	
-
 	$scope.dropdownClicked = function()
 	{
 		if($scope.campus){
@@ -51,40 +45,54 @@ angular.module('SeHub')
 					console.log($scope.campusObj); // TODO REMOVE!!
 				}
 			};
-		}
-		
+		};
 	};
 
-	$scope.submitClicked = function()
+	$scope.submitClicked = function(ev)
 	{
-		console.log($scope.user.AcMail);
-		$scope.mail = 'pin';
-		console.log($scope.mail);
+		if($scope.user.AcMail != null)
+		{
+			var fullMail = $scope.user.AcMail + $scope.campusObj.email_ending; // Holds the full academic email of the user
+			apiService.sendValidationMail($scope.user.seToken, fullMail).success(function(data)
+			{
+				console.log("DONE - 200");
+			  	$mdDialog.show($mdDialog.alert().title('E-mail Verification').content('A verification e-mail has been sent to your email address.')
+		        .ariaLabel('Email verification alert dialog').ok('Got it!').targetEvent(ev));
+		        // TODO - ADD DELETE COOKIES
+		        $cookies.remove("com.sehub.www");
+		        // $location.path("templates/views/home.html"); // Redirecting to home page // TODO REMOVE REMOVE!!
+			}).error(function()
+			{
+				$mdDialog.show($mdDialog.alert().title('Error - E-mail Verification').content('An error has occured in your e-mail address.')
+		        .ariaLabel('Email verification error alert dialog').ok('Got it!').targetEvent(ev));
+			});
+		};
 	};
 
-	
 
-	apiService.getAllCampuses($scope.user.seToken).success(function(data)
-	{
-		$scope.campuses = data;
-	}).error(function()
-	{
-		// TODO
-	});
+	// TODO FOR LATER
+	// TODO FOR LATER
 
-	// apiService.sendValidationMail($scope.user.seToken, $scope.fullMail).success(function(data) // TODO: Add 2nd parameter email type Email
-	// {
-	// 	console.log($scope.fullMail);
-	// 	console.log("200");
-		
-	// 	// TODO
-	// }).error(function()
-	// {
-
-	// });
+	$scope.getPopWindowPosition = function()
+  	{
+    	return Object.keys($scope.toastPosition).filter(function(pos)
+    		{
+    			return $scope.toastPosition[pos];
+    		}).join(' ');
+  	};
+  	
+  	$scope.toastPosition =
+  	{
+	    bottom: false,
+	    top: true,
+	    left: false,
+	    right: true
+  	};
 
+  	// TODO FOR LATER
+  	// TODO FOR LATER
 
 	
+}]);
 
 
-}]);																						
\ No newline at end of file
diff --git a/templates/views/register.html b/templates/views/register.html
index bbe6b26..d73d0d9 100644
--- a/templates/views/register.html
+++ b/templates/views/register.html
@@ -18,8 +18,8 @@
 		</div>
 		<div layout="row" layout-align="center center">
 			Are You A Lecturer?	
-			<md-switch ng-model="user.isLecturer" aria-label="Switch 1">
-			</md-switch>
+			<md-switch class="md-primary" md-no-ink aria-label="Switch No Ink" ng-model="data.cb5">
+  			</md-switch>
 		</div>
 	</div>
 		<div>
@@ -37,7 +37,7 @@
 		</div>
 			<div>
 				<div class = "disabledSubmitButton">
-					<md-button ng-click="submitClicked()" ng-disabled="!campusChecked" class="md-raised md-primary">Submit</md-button>
+					<md-button ng-click="submitClicked($event)" ng-disabled="!campusChecked" class="md-raised md-primary">Submit</md-button>
 				</div>
 			</div>
 		</div>