diff --git a/src/views/admin/controllers/Edit.vue b/src/views/admin/controllers/Edit.vue
index d5d2e37..c2e1ecb 100644
--- a/src/views/admin/controllers/Edit.vue
+++ b/src/views/admin/controllers/Edit.vue
@@ -136,7 +136,7 @@ export default {
                     miagnd: false,
                     app: false,
                     twr: false,
-                    gnd: false,
+                    gnd: false
                     //dels: false,
                     //gnds: false,
                     //twrs: false,
@@ -178,7 +178,11 @@ export default {
                 oi: this.controller.oi,
                 vis: this.controller.vis,
             };
-            this.controller.certifications.forEach(cert => this.form.certs[cert.code] = true);
+            this.controller.certifications.forEach(cert => {
+    			if (!cert.code.endsWith('s')) {
+        			this.form.certs[cert.code] = true;}
+				});
+				
             this.controller.roles.forEach(role => this.form.roles[role.code] = true);
             this.usedOi = (await zabApi.get(`/controller/oi`)).data.data;
         },
diff --git a/src/views/instructor/controllers/Edit.vue b/src/views/instructor/controllers/Edit.vue
index 1df5d8c..36e335e 100644
--- a/src/views/instructor/controllers/Edit.vue
+++ b/src/views/instructor/controllers/Edit.vue
@@ -116,7 +116,7 @@ export default {
                     miagnd: false,
                     app: false,
                     twr: false,
-                    gnd: false,
+                    gnd: false
                     //dels: false,
                     //gnds: false,
                     //twrs: false,
@@ -158,7 +158,10 @@ export default {
 				vis: this.controller.vis,
 			};
 			
-			this.controller.certifications.forEach(cert => this.form.certs[cert.code] = true);
+			this.controller.certifications.forEach(cert => {
+    			if (!cert.code.endsWith('s')) {
+        			this.form.certs[cert.code] = true;}
+				}); // this.controller.certifications.forEach(cert => this.form.certs[cert.code] = true);
             this.controller.roles.forEach(role => this.form.roles[role.code] = true);
 			this.usedOi = (await zabApi.get(`/controller/oi`)).data.data;
 		},