Index: dbLearnStar-model/pom.xml
===================================================================
--- dbLearnStar-model/pom.xml	(revision 33d1011215fb8ead30ed3e8ccccb1c05832828df)
+++ dbLearnStar-model/pom.xml	(revision fbb7458669ddeea54a41f0e763501c91320ebbe1)
@@ -6,5 +6,5 @@
 	<groupId>dblearnstar</groupId>
 	<artifactId>dblearnstar-model</artifactId>
-	<version>0.0.2-SNAPSHOT</version>
+	<version>0.0.3-SNAPSHOT</version>
 
 	<name>dbLearnStar - Model</name>
Index: dbLearnStar-model/src/main/java/dblearnstar/model/model/ModelConstants.java
===================================================================
--- dbLearnStar-model/src/main/java/dblearnstar/model/model/ModelConstants.java	(revision 33d1011215fb8ead30ed3e8ccccb1c05832828df)
+++ dbLearnStar-model/src/main/java/dblearnstar/model/model/ModelConstants.java	(revision fbb7458669ddeea54a41f0e763501c91320ebbe1)
@@ -23,23 +23,24 @@
 public class ModelConstants {
 
-	public final static String	TaskCodeSQL		= "SQL";
-	public final static String	TaskCodeDDL		= "DDL";
-	public final static String	TaskCodeTEXT	= "TEXT";
-	public final static String	TaskCodeUPLOAD	= "UPLOAD";
+	public final static String TaskCodeSQL = "SQL";
+	public final static String TaskCodeDDL = "DDL";
+	public final static String TaskCodeTEXT = "TEXT";
+	public final static String TaskCodeUPLOAD = "UPLOAD";
 
-   public static final String ActivityEval = "TASK_EVAL";
-   public static final String ActivityExecAll = "TASK_RUNONLY";
-   public static final String ActivityExecSelection = "TASK_RUNONLY_SELECTION";
-   public static final String ActivityPlan = "TASK_PLANONLY";
-   public static final String ActivityViewTask = "VIEW_TASK";
-   public static final String ActivityStillViewing = "TASK_STILL_VIEWING";
-   public static final String ActivitySubmitText = "TASK_SUBMIT_TEXT";
-   public static final String ActivityTryUpload = "TRIED TASK_UPLOAD";
+	public static final String ActivityEval = "TASK_EVAL";
+	public static final String ActivityExecAll = "TASK_RUNONLY";
+	public static final String ActivityExecSelection = "TASK_RUNONLY_SELECTION";
+	public static final String ActivityPlan = "TASK_PLANONLY";
+	public static final String ActivityViewTask = "VIEW_TASK";
+	public static final String ActivityStillViewing = "TASK_STILL_VIEWING";
+	public static final String ActivitySubmitText = "TASK_SUBMIT_TEXT";
+	public static final String ActivityTryUpload = "TRIED TASK_UPLOAD";
 
-	
+	public static final String PersonDeactivatedSuffix = "---";
+
 	/**
 	 * Pages
 	 */
-	public final static String	PageIndex		= "Index";
+	public final static String PageIndex = "Index";
 
 }
Index: dbLearnStar-webApp/pom.xml
===================================================================
--- dbLearnStar-webApp/pom.xml	(revision 33d1011215fb8ead30ed3e8ccccb1c05832828df)
+++ dbLearnStar-webApp/pom.xml	(revision fbb7458669ddeea54a41f0e763501c91320ebbe1)
@@ -1,6 +1,3 @@
-<project
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"
-	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xmlns="http://maven.apache.org/POM/4.0.0">
+<project xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0">
 
 	<modelVersion>4.0.0</modelVersion>
@@ -14,5 +11,5 @@
 	<groupId>dblearnstar</groupId>
 	<artifactId>dblearnstar</artifactId>
-	<version>0.8.7</version>
+	<version>0.8.9</version>
 	<name>dbLearnStar</name>
 
@@ -37,14 +34,14 @@
 		<java.version>15</java.version>
 
-		<spring-boot.version>2.6.1</spring-boot.version>
+		<spring-boot.version>2.6.3</spring-boot.version>
 		<log4j.version>2.17.1</log4j.version>
-		<tapestry.version>5.7.3</tapestry.version>
+		<tapestry.version>5.8.0</tapestry.version>
 		<tapestry-testify.version>1.0.4</tapestry-testify.version>
 		<tapestry-xpath.version>1.0.1</tapestry-xpath.version>
 
-		<jackson.version>2.13.0</jackson.version>
+		<jackson.version>2.13.1</jackson.version>
 		<geb.version>2.3.1</geb.version>
 		<htmlunit-driver.version>2.33.3</htmlunit-driver.version>
-		<json.version>1.1.4</json.version>
+		<javax.json.version>1.1.4</javax.json.version>
 		<selenium.version>3.141.59</selenium.version>
 		<servlet-api.version>3.0.1</servlet-api.version>
@@ -53,5 +50,5 @@
 
 		<postgresql.version>42.3.1</postgresql.version>
-		<cas-client.version>3.6.2</cas-client.version>
+		<cas-client.version>3.6.4</cas-client.version>
 
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -71,5 +68,5 @@
 			<groupId>dblearnstar</groupId>
 			<artifactId>dblearnstar-model</artifactId>
-			<version>0.0.2-SNAPSHOT</version>
+			<version>0.0.3-SNAPSHOT</version>
 		</dependency>
 
@@ -226,5 +223,5 @@
 			<groupId>org.glassfish</groupId>
 			<artifactId>javax.json</artifactId>
-			<version>${json.version}</version>
+			<version>${javax.json.version}</version>
 		</dependency>
 		<dependency>
@@ -327,7 +324,7 @@
 		</dependency>
 		<dependency>
-			<groupId>org.webjars.npm</groupId>
+			<groupId>com.github.vertical-blank</groupId>
 			<artifactId>sql-formatter</artifactId>
-			<version>2.3.3</version>
+			<version>2.0.3</version>
 		</dependency>
 	</dependencies>
@@ -458,17 +455,4 @@
 									<outputDirectory>${project.basedir}/target/classes/META-INF/assets/</outputDirectory>
 								</artifactItem>
-								<artifactItem>
-									<groupId>org.webjars.npm</groupId>
-									<artifactId>sql-formatter</artifactId>
-									<type>jar</type>
-									<includes>META-INF/resources/webjars/**/*</includes>
-									<outputDirectory>${project.basedir}/target/classes/META-INF/assets/sql-formatter/</outputDirectory>
-									<fileMappers>
-										<org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
-											<pattern>^\QMETA-INF/resources/webjars/sql-formatter/2.3.3/dist/\E</pattern>
-											<replacement>./</replacement>
-										</org.codehaus.plexus.components.io.filemappers.RegExpFileMapper>
-									</fileMappers>
-								</artifactItem>
 							</artifactItems>
 						</configuration>
Index: dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManagePersons.java
===================================================================
--- dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManagePersons.java	(revision 33d1011215fb8ead30ed3e8ccccb1c05832828df)
+++ dbLearnStar-webApp/src/main/java/dblearnstar/webapp/pages/admin/ManagePersons.java	(revision fbb7458669ddeea54a41f0e763501c91320ebbe1)
@@ -39,4 +39,5 @@
 import dblearnstar.model.entities.Role;
 import dblearnstar.model.entities.Student;
+import dblearnstar.model.model.ModelConstants;
 import dblearnstar.model.model.UserInfo;
 import dblearnstar.webapp.annotations.AdministratorPage;
@@ -181,3 +182,12 @@
 	}
 
+	@CommitAfter
+	public void onTogglePersonStatus(Person p) {
+		if (p.getUserName().contains(ModelConstants.PersonDeactivatedSuffix)) {
+			p.setUserName(p.getUserName().replace(ModelConstants.PersonDeactivatedSuffix, ""));
+		} else {
+			p.setUserName(p.getUserName() + ModelConstants.PersonDeactivatedSuffix);
+		}
+	}
+
 }
Index: dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/ManagePersons.tml
===================================================================
--- dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/ManagePersons.tml	(revision 33d1011215fb8ead30ed3e8ccccb1c05832828df)
+++ dbLearnStar-webApp/src/main/resources/dblearnstar/webapp/pages/admin/ManagePersons.tml	(revision fbb7458669ddeea54a41f0e763501c91320ebbe1)
@@ -49,5 +49,5 @@
 			class="btn btn-sm btn-primary"><t:SVGIcon t:path="edit" />
 			${message:edit-label}</a>
-		<a href="" t:type="actionlink" t:id="TogglePersonStatus"
+		<a href="" t:type="eventLink" t:id="togglePersonStatus"
 			t:context="person" class="btn btn-sm btn-secondary"><t:SVGIcon
 				t:path="toggle-left" /> ${message:toggle-status-label}</a>