diff --git a/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.html b/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.html
index cb692e59e..f0b17c8d0 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.html
+++ b/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.html
@@ -1,6 +1,6 @@
-<div ng-show="view.state.supportCallResponse.collectEligibilityConfirmation" class="student-requirement">
+<div class="student-requirement" ng-show="props.supportCallResponse.collectEligibilityConfirmation">
 	<h4>TA Eligibility Requirements</h4>
-	<div style="margin-top: 34px;">
+	<div>
 		<p>
 			Full-time (12 units) registered graduate student, current cumulative GPA is 3.00 or higher, total appointments for this quarter does not exceed 75%,
 		</p>
@@ -8,7 +8,7 @@ <h4>TA Eligibility Requirements</h4>
 	<div class="checkbox religibility-checkbox">
 		<div role="menuitem" ng-click="toggleEligibilityConfirmed()">
 			<div class="checkbox checkbox-replace color-primary neon-cb-replacement"
-				ng-class="{ 'checked': view.state.supportCallResponse.eligibilityConfirmed }">
+				ng-class="{ 'checked': props.supportCallResponse.eligibilityConfirmed }">
 				<label class="cb-wrapper">
 					<div class="checked"></div>
 				</label>
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.js b/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.js
index c0239ea93..0ef0ba90b 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/confirmEligible/confirmEligible.js
@@ -1,4 +1,4 @@
-summaryApp.directive("confirmEligible", this.confirmEligible = function () {
+instructionalSupportApp.directive("confirmEligible", this.confirmEligible = function () {
 	return {
 		restrict: 'E',
 		templateUrl: 'confirmEligible.html',
@@ -7,16 +7,23 @@ summaryApp.directive("confirmEligible", this.confirmEligible = function () {
 			state: '<'
 		},
 		link: function (scope, element, attrs) {
-			scope.props = {};
-			scope.mapStateToProps(scope.state);
-
 			$rootScope.$on('supportStaffFormStateChanged', function (event, data) {
 				scope.mapStateToProps(data);
 			});
 
 			scope.mapStateToProps = function(state) {
-				return state;
+				scope.props.supportCallResponse = state.supportCallResponse;
+				scope.props.supportCallResponse.eligibilityConfirmed = Boolean(scope.props.supportCallResponse.eligibilityConfirmed);
 			};
+
+			scope.toggleEligibilityConfirmed = function() {
+				scope.props.supportCallResponse.eligibilityConfirmed = !scope.props.supportCallResponse.eligibilityConfirmed;
+
+				studentActions.updateSupportCallResponse(scope.props.supportCallResponse);
+			};
+
+			scope.props = {};
+			scope.mapStateToProps(scope.state);
 		}
 	};
 });
\ No newline at end of file
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/modalPreferenceComments/modalPreferenceComments.js b/app/instructionalSupport/studentSupportCallForm/directives/modalPreferenceComments/modalPreferenceComments.js
index 9c4de8e33..aacbecc48 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/modalPreferenceComments/modalPreferenceComments.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/modalPreferenceComments/modalPreferenceComments.js
@@ -1,4 +1,4 @@
-summaryApp.directive("confirmEligible", this.confirmEligible = function () {
+instructionalSupportApp.directive("confirmEligible", this.confirmEligible = function () {
 	return {
 		restrict: 'E',
 		templateUrl: 'confirmEligible.html',
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.js b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.js
index cc3ca2c0d..9ddd850b1 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/crnAvailable/crnAvailable.js
@@ -1,4 +1,4 @@
-summaryApp.directive("crnAvailable", this.crnAvailable = function () {
+instructionalSupportApp.directive("crnAvailable", this.crnAvailable = function () {
 	return {
 		restrict: 'E',
 		templateUrl: 'crnAvailable.html',
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.js b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.js
index a4bc1d88a..d3b175bc3 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/gridAvailable/gridAvailable.js
@@ -1,4 +1,4 @@
-summaryApp.directive("gridAvailable", this.gridAvailable = function () {
+instructionalSupportApp.directive("gridAvailable", this.gridAvailable = function () {
 	return {
 		restrict: 'E',
 		templateUrl: 'gridAvailable.html',
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.js b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.js
index a84359627..44d2a30f5 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentAvailabilities/studentAvailabilities.js
@@ -1,4 +1,4 @@
-summaryApp.directive("studentAvailabilities", this.studentAvailabilities = function () {
+instructionalSupportApp.directive("studentAvailabilities", this.studentAvailabilities = function () {
 	return {
 		restrict: 'E',
 		templateUrl: 'studentAvailabilities.html',
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.js b/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.js
index 4292b20ff..867ab6362 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentComments/studentComments.js
@@ -1,4 +1,4 @@
-summaryApp.directive("studentComments", this.studentComments = function () {
+instructionalSupportApp.directive("studentComments", this.studentComments = function () {
 	return {
 		restrict: 'E',
 		templateUrl: 'studentComments.html',
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentFormReview/studentFormReview.js b/app/instructionalSupport/studentSupportCallForm/directives/studentFormReview/studentFormReview.js
index aaf13c4c2..5e55ec5e2 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentFormReview/studentFormReview.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentFormReview/studentFormReview.js
@@ -1,4 +1,4 @@
-summaryApp.directive("studentFormReview", this.studentFormReview = function () {
+instructionalSupportApp.directive("studentFormReview", this.studentFormReview = function () {
 	return {
 		restrict: 'E',
 		templateUrl: 'studentFormReview.html',
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferenceSelector/studentPreferenceSelector.js b/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferenceSelector/studentPreferenceSelector.js
index 8aa7b1926..b12bf1395 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferenceSelector/studentPreferenceSelector.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferenceSelector/studentPreferenceSelector.js
@@ -1,6 +1,3 @@
-/**
- * Provides the main course table in the Courses View
- */
 instructionalSupportApp.directive("studentPreferenceSelector", this.studentPreferenceSelector = function ($rootScope, instructionalSupportAssignmentActionCreators) {
 	return {
 		restrict: 'E',
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferences.js b/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferences.js
index 5c13b8c94..f68cfc5db 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferences.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/studentPreferences/studentPreferences.js
@@ -1,4 +1,4 @@
-summaryApp.directive("studentPreferences", this.studentPreferences = function () {
+instructionalSupportApp.directive("studentPreferences", this.studentPreferences = function () {
 	return {
 		restrict: 'E',
 		templateUrl: 'studentPreferences.html',
diff --git a/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.js b/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.js
index 1a7d00ae3..46f5e4744 100644
--- a/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.js
+++ b/app/instructionalSupport/studentSupportCallForm/directives/teachingQualifications/teachingQualifications.js
@@ -1,4 +1,4 @@
-summaryApp.directive("teachingQualifications", this.teachingQualifications = function () {
+instructionalSupportApp.directive("teachingQualifications", this.teachingQualifications = function () {
 	return {
 		restrict: 'E',
 		templateUrl: 'teachingQualifications.html',