diff --git a/www/api/models/Tag_class.js b/www/api/models/Tag_class.js
index 245eaf2..9075fcf 100644
--- a/www/api/models/Tag_class.js
+++ b/www/api/models/Tag_class.js
@@ -42,6 +42,11 @@ module.exports = {
         {
             class_type: 'custom',
             description: 'Stroke Information'
+        },
+        ,
+        {
+            class_type: 'handshake',
+            description: 'PLC Handshake Tag'
         }
     ]
 };
diff --git a/www/assets/js/ng/factory_tags.js b/www/assets/js/ng/factory_tags.js
index 959ccfa..f24afa5 100644
--- a/www/assets/js/ng/factory_tags.js
+++ b/www/assets/js/ng/factory_tags.js
@@ -55,7 +55,7 @@ poconsole.factory('tags',function($q, $http, $log, dateConversion){
         $http.post('/tag/create', {
             tag: tag.tag,
             name: tag.name,
-            tag_class:5,
+            tag_class:tag.tag_class,
             deviceID: tag.deviceID,
             units: tag.units,
             minExpected: tag.minExpected,
@@ -74,7 +74,7 @@ poconsole.factory('tags',function($q, $http, $log, dateConversion){
         $http.post('/tag/update/'+ tag.id, {
             tag: tag.tag,
             name: tag.name,
-            tag_class:5,
+            tag_class:tag.tag_class,
             deviceID: tag.deviceID,
             units: tag.units,
             minExpected: tag.minExpected,
diff --git a/www/assets/templates/tags.html b/www/assets/templates/tags.html
index de2a25e..7953755 100644
--- a/www/assets/templates/tags.html
+++ b/www/assets/templates/tags.html
@@ -28,6 +28,13 @@
                         <label for="data_type">Data Type</label>
                         <select ng-model="newTag.data_type" ng-options="t as t.data_type for t in data_types track by t.id" class="form-control" id="data_type"></select>
                     </div>
+                    <div class="form-group">
+                        <label for="tag_type">Tag Type</label>
+                        <select ng-model="newTag.tag_class" class="form-control" id="tag_type">
+                          <option value=5>Normal</option>
+                          <option value=6>PLC Handshake</option>
+                        </select>
+                    </div>
                     <div class="col-md-5">
                         <div class="form-group">
                             <label for="minExpected">Minimum Value Expected</label>
@@ -99,6 +106,13 @@
                         <label for="data_type">Data Type</label>
                         <select ng-model="editTag.data_type" ng-options="t as t.data_type for t in data_types track by t.id" class="form-control" id="data_type"></select>
                     </div>
+                    <div class="form-group">
+                        <label for="tag_type">Tag Type</label>
+                        <select ng-model="editTag.tag_class" class="form-control" id="tag_type">
+                          <option value=5>Normal</option>
+                          <option value=6>PLC Handshake</option>
+                        </select>
+                    </div>
                     <div class="col-md-5">
                         <div class="form-group">
                             <label for="minExpected">Minimum Value Expected</label>