diff --git a/db/zm_update-1.35.4.sql b/db/zm_update-1.35.4.sql
index d3ef8c7b9..44d195224 100644
--- a/db/zm_update-1.35.4.sql
+++ b/db/zm_update-1.35.4.sql
@@ -1,55 +1,60 @@
 --
--- This updates a 1.28.0 database to 1.28.99.0
+-- This update adds ONVIF features
 --
 
-
---
--- Add Config* fields; used for specifying ONVIF/PSIA options
---
 SET @s = (SELECT IF(
 	(SELECT COUNT(*)
 	FROM INFORMATION_SCHEMA.COLUMNS
 	WHERE table_name = 'Monitors'
 	AND table_schema = DATABASE()
-	AND column_name = 'ConfigType'
+	AND column_name = 'ONVIF_URL'
 	) > 0,
-"SELECT 'Column ConfigType already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD COLUMN `ConfigType` ENUM('None','ONVIF','PSIA') NOT NULL DEFAULT 'None' AFTER `Triggers`"
+"SELECT 'Column ONVIF_URL already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_URL` VARCHAR(255) NOT NULL DEFAULT '' AFTER `Triggers`"
 ));
 
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
---
--- Add Config* fields; used for specifying ONVIF/PSIA options
---
 SET @s = (SELECT IF(
 	(SELECT COUNT(*)
 	FROM INFORMATION_SCHEMA.COLUMNS
 	WHERE table_name = 'Monitors'
 	AND table_schema = DATABASE()
-	AND column_name = 'ConfigURL'
+	AND column_name = 'ONVIF_Username'
 	) > 0,
-"SELECT 'Column ConfigURL already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD COLUMN `ConfigURL` VARCHAR(255) NOT NULL DEFAULT '' AFTER `ConfigType`"
+"SELECT 'Column ONVIF_Username already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Username` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_URL`"
 ));
 
 PREPARE stmt FROM @s;
 EXECUTE stmt;
 
---
--- Add Config* fields; used for specifying ONVIF/PSIA options
---
 SET @s = (SELECT IF(
-	(SELECT COUNT(*)
-	FROM INFORMATION_SCHEMA.COLUMNS
-	WHERE table_name = 'Monitors'
-	AND table_schema = DATABASE()
-	AND column_name = 'ConfigOptions'
-	) > 0,
-"SELECT 'Column ConfigOptions already exists in Monitors'",
-"ALTER TABLE `Monitors` ADD COLUMN `ConfigOptions` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ConfigURL`"
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'ONVIF_Password'
+  ) > 0,
+"SELECT 'Column ONVIF_Password already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Password` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_Username`"
 ));
 
 PREPARE stmt FROM @s;
 EXECUTE stmt;
+
+SET @s = (SELECT IF(
+  (SELECT COUNT(*)
+  FROM INFORMATION_SCHEMA.COLUMNS
+  WHERE table_name = 'Monitors'
+  AND table_schema = DATABASE()
+  AND column_name = 'ONVIF_Options'
+  ) > 0,
+"SELECT 'Column ONVIF_Options already exists in Monitors'",
+"ALTER TABLE `Monitors` ADD COLUMN `ONVIF_Options` VARCHAR(64) NOT NULL DEFAULT '' AFTER `ONVIF_Password`"
+));
+
+PREPARE stmt FROM @s;
+EXECUTE stmt;
+
diff --git a/web/skins/classic/views/monitor.php b/web/skins/classic/views/monitor.php
index 6d7b7db03..be4df7b16 100644
--- a/web/skins/classic/views/monitor.php
+++ b/web/skins/classic/views/monitor.php
@@ -495,13 +495,12 @@ if ( ZM_HAS_V4L && ($tab != 'source' || $monitor->Type() != 'Local') ) {
       <input type="hidden" name="newMonitor[V4LCapturesPerFrame]" value="<?php echo validHtmlStr($monitor->V4LCapturesPerFrame()) ?>"/>
 <?php
 }
-if ( $tab != 'config' ) {
+if ( $tab != 'onvif' ) {
 ?>
-        <input type="hidden" name="newMonitor[ConfigType]" value="<?php echo validHtmlStr($monitor->ConfigType()) ?>"/>
-        <input type="hidden" name="newMonitor[ConfigURL]" value="<?php echo validHtmlStr($monitor->ConfigURL()) ?>"/>
-        <input type="hidden" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User()) ?>"/>
-        <input type="hidden" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass()) ?>"/>
-        <input type="hidden" name="newMonitor[ConfigOptions]" value="<?php echo validHtmlStr($monitor->ConfigOptions()) ?>"/>
+        <input type="hidden" name="newMonitor[ONVIF_URL]" value="<?php echo validHtmlStr($monitor->ONVIF_URL()) ?>"/>
+        <input type="hidden" name="newMonitor[ONVIF_Username]" value="<?php echo validHtmlStr($monitor->ONVIF_User()) ?>"/>
+        <input type="hidden" name="newMonitor[ONVIF_Password]" value="<?php echo validHtmlStr($monitor->ONVIF_Password()) ?>"/>
+        <input type="hidden" name="newMonitor[ONVIF_Options]" value="<?php echo validHtmlStr($monitor->ONVIF_Options()) ?>"/>
 <?php
 }
 if ( $tab != 'source' || $monitor->Type()!= 'Remote' ) {
@@ -759,28 +758,24 @@ switch ( $tab ) {
         }
         break;
     }
-    case 'config' :
+    case 'onvif' :
     {
 ?>
-            <tr>
-              <td><?php echo translate('ConfigType') ?></td>
-              <td><?php echo htmlSelect('newMonitor[ConfigType]', $configTypes, $monitor->ConfigType(), "submitTab('$tab')"); ?></td>
-            </tr>
             <tr>  
-              <td><?php echo translate('ConfigURL') ?></td>
-              <td><input type="text" name="newMonitor[ConfigURL]" value="<?php echo validHtmlStr($monitor->ConfigURL()) ?>"/></td>
+              <td><?php echo translate('ONVIF_URL') ?></td>
+              <td><input type="text" name="newMonitor[ONVIF_URL]" value="<?php echo validHtmlStr($monitor->ONVIF_URL()) ?>"/></td>
             </tr>
             <tr>
               <td><?php echo translate('Username') ?></td>
-              <td><input type="text" name="newMonitor[User]" value="<?php echo validHtmlStr($monitor->User()) ?>"/></td>
+              <td><input type="text" name="newMonitor[ONVIF_Username]" value="<?php echo validHtmlStr($monitor->ONVIF_Username()) ?>"/></td>
             </tr>
             <tr>
               <td><?php echo translate('Password') ?></td>
-              <td><input type="text" name="newMonitor[Pass]" value="<?php echo validHtmlStr($monitor->Pass()) ?>"/></td>
+              <td><input type="text" name="newMonitor[ONVIF_Password]" value="<?php echo validHtmlStr($monitor->ONVIF_Password()) ?>"/></td>
             </tr>
             <tr>
-              <td><?php echo translate('ConfigOptions') ?></td>
-              <td><input type="text" name="newMonitor[ConfigOptions]" value="<?php echo validHtmlStr($monitor->ConfigOptions()) ?>"/></td>
+              <td><?php echo translate('ONVIF_Options') ?></td>
+              <td><input type="text" name="newMonitor[ONVIF_Options]" value="<?php echo validHtmlStr($monitor->ONVIF_Options()) ?>"/></td>
             </tr>
 <?php
         break;