diff --git a/module.xml b/module.xml
index c0e6020..7b468d4 100644
--- a/module.xml
+++ b/module.xml
@@ -30,24 +30,24 @@
 	<database>
 		<table name="sccpdevice">
 			<field name="name" type="string" length="15" default="" primarykey="true"/>
-			<field name="type" type="string" length="15" default="NULL" notnull="false"/>
-			<field name="addon" type="string" length="45" default="NULL" notnull="false"/>
-			<field name="_description" type="string" length="45" default="NULL" notnull="false"/>
-			<field name="tzoffset" type="string" length="5" default="NULL" notnull="false"/>
-			<field name="imageversion" type="string" length="31" default="NULL" notnull="false"/>
+			<field name="type" type="string" length="15" notnull="false"/>
+			<field name="addon" type="string" length="45" notnull="false"/>
+			<field name="_description" type="string" length="45" notnull="false"/>
+			<field name="tzoffset" type="string" length="5" notnull="false"/>
+			<field name="imageversion" type="string" length="31" notnull="false"/>
 			<field name="deny" type="string" length="100" default="0.0.0.0/0.0.0.0" notnull="false"/>
 			<field name="permit" type="string" length="100" default="internal" notnull="false"/>
-			<field name="earlyrtp" type="string" default="NULL" notnull="false"/>
+			<field name="earlyrtp" type="string" notnull="false"/>
 			<field name="mwilamp" type="string" default="on" notnull="false"/>
 			<field name="mwioncall" type="string" default="on" notnull="false"/>
-			<field name="dndFeature" type="string" default="NULL" notnull="false"/>
-			<field name="transfer" type="string" default="NULL" notnull="false"/>
+			<field name="dndFeature" type="string" notnull="false"/>
+			<field name="transfer" type="string" notnull="false"/>
 			<field name="cfwdall" type="string" default="on" notnull="false"/>
 			<field name="cfwdbusy" type="string" default="on" notnull="false"/>
 			<field name="private" type="string" default="off"/>
 			<field name="privacy" type="string" default="full"/>
-			<field name="nat" type="string" default="NULL" notnull="false"/>
-			<field name="directrtp" type="string" default="NULL" notnull="false"/>
+			<field name="nat" type="string" notnull="false"/>
+			<field name="directrtp" type="string" notnull="false"/>
 			<field name="softkeyset" type="string" length="100" default="softkeyset" notnull="false"/>
 			<field name="audio_tos" type="string" length="11" default="0xB8" notnull="false"/>
 			<field name="audio_cos" type="string" length="1" default="6" notnull="false"/>
@@ -60,73 +60,73 @@
 			<field name="conf_music_on_hold_class" type="string" length="80" default="default" notnull="false"/>
 			<field name="conf_show_conflist" type="string" default="on"/>
 			<field name="force_dtmfmode" type="string" default="auto"/>
-			<field name="setvar" type="string" length="100" default="NULL" notnull="false"/>
-			<field name="backgroundImage" type="string" length="255" default="NULL" notnull="false"/>
-			<field name="backgroundThumbnail" type="string" length="255" default="NULL" notnull="false"/>
-			<field name="ringtone" type="string" length="255" default="NULL" notnull="false"/>
-			<field name="callhistory_answered_elsewhere" type="string" default="NULL" notnull="false"/>
-			<field name="_hwlang" type="string" length="12" default="NULL" notnull="false"/>
-			<field name="_loginname" type="string" length="20" default="NULL" notnull="false"/>
+			<field name="setvar" type="string" length="100" notnull="false"/>
+			<field name="backgroundImage" type="string" length="255" notnull="false"/>
+			<field name="backgroundThumbnail" type="string" length="255" notnull="false"/>
+			<field name="ringtone" type="string" length="255" notnull="false"/>
+			<field name="callhistory_answered_elsewhere" type="string" notnull="false"/>
+			<field name="_hwlang" type="string" length="12" notnull="false"/>
+			<field name="_loginname" type="string" length="20" notnull="false"/>
 			<field name="_profileid" type="integer" default="0"/>
-			<field name="_dialrules" type="string" length="255" default="NULL" notnull="false"/>
+			<field name="_dialrules" type="string" length="255" notnull="false"/>
 			<field name="useRedialMenu" type="string" length="5" default="no" notnull="false"/>
 			<field name="cfwdnoanswer" type="string" default="on" notnull="false"/>
 			<field name="park" type="string" default="on" notnull="false"/>
-			<field name="monitor" type="string" default="NULL" notnull="false"/>
-			<field name="transfer_on_hangup" type="string" default="NULL" notnull="false"/>
-			<field name="phonecodepage" type="string" length="50" default="NULL" notnull="false"/>
+			<field name="monitor" type="string" notnull="false"/>
+			<field name="transfer_on_hangup" type="string" notnull="false"/>
+			<field name="phonecodepage" type="string" length="50" notnull="false"/>
 		</table>
-	  <table name="sccpline">
-	    <field name="id" type="integer" autoincrement="true"/>
-	    <field name="pin" type="string" length="7" default="NULL" notnull="false"/>
-	    <field name="label" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="description" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="context" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="incominglimit" type="integer" default="6" notnull="false"/>
-	    <field name="transfer" type="string" default="NULL" notnull="false"/>
-	    <field name="mailbox" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="vmnum" type="string" length="45" default="*97" notnull="false"/>
-	    <field name="cid_name" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="cid_num" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="disallow" type="string" length="255" default="NULL" notnull="false"/>
-	    <field name="allow" type="string" length="255" default="NULL" notnull="false"/>
-	    <field name="trnsfvm" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="secondary_dialtone_digits" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="secondary_dialtone_tone" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="musicclass" type="string" length="45" default="default" notnull="false"/>
-	    <field name="language" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="accountcode" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="echocancel" type="string" default="off"/>
-	    <field name="silencesuppression" type="string" default="off"/>
-	    <field name="callgroup" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="pickupgroup" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="namedcallgroup" type="string" length="100" default="NULL" notnull="false"/>
-	    <field name="namedpickupgroup" type="string" length="100" default="NULL" notnull="false"/>
-	    <field name="adhocNumber" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="meetme" type="string" length="5" default="NULL" notnull="false"/>
-	    <field name="meetmenum" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="meetmeopts" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="regexten" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="directed_pickup" type="string" default="NULL" notnull="false"/>
-	    <field name="directed_pickup_context" type="string" length="100" default="NULL" notnull="false"/>
-	    <field name="pickup_modeanswer" type="string" default="NULL" notnull="false"/>
-	    <field name="amaflags" type="string" length="45" default="NULL" notnull="false"/>
-	    <field name="dnd" type="string" default="reject" notnull="false"/>
-	    <field name="videomode" type="string" default="auto" notnull="false"/>
-	    <field name="setvar" type="string" length="50" default="NULL" notnull="false"/>
-	    <field name="name" type="string" length="40" default="" primarykey="true"/>
-	    <field name="phonecodepage" type="string" length="50" default="NULL" notnull="false"/>
-	    <key name="id" type="unique">
-	      <column name="id"/>
-	    </key>
-	  </table>
+			<table name="sccpline">
+			<field name="id" type="integer" autoincrement="true"/>
+			<field name="pin" type="string" length="7" notnull="false"/>
+			<field name="label" type="string" length="45" notnull="false"/>
+			<field name="description" type="string" length="45" notnull="false"/>
+			<field name="context" type="string" length="45" notnull="false"/>
+			<field name="incominglimit" type="integer" default="6" notnull="false"/>
+			<field name="transfer" type="string" notnull="false"/>
+			<field name="mailbox" type="string" length="45" notnull="false"/>
+			<field name="vmnum" type="string" length="45" default="*97" notnull="false"/>
+			<field name="cid_name" type="string" length="45" notnull="false"/>
+			<field name="cid_num" type="string" length="45" notnull="false"/>
+			<field name="disallow" type="string" length="255" notnull="false"/>
+			<field name="allow" type="string" length="255" notnull="false"/>
+			<field name="trnsfvm" type="string" length="45" notnull="false"/>
+			<field name="secondary_dialtone_digits" type="string" length="45" notnull="false"/>
+			<field name="secondary_dialtone_tone" type="string" length="45" notnull="false"/>
+			<field name="musicclass" type="string" length="45" default="default" notnull="false"/>
+			<field name="language" type="string" length="45" notnull="false"/>
+			<field name="accountcode" type="string" length="45" notnull="false"/>
+			<field name="echocancel" type="string" default="off"/>
+			<field name="silencesuppression" type="string" default="off"/>
+			<field name="callgroup" type="string" length="45" notnull="false"/>
+			<field name="pickupgroup" type="string" length="45" notnull="false"/>
+			<field name="namedcallgroup" type="string" length="100" notnull="false"/>
+			<field name="namedpickupgroup" type="string" length="100" notnull="false"/>
+			<field name="adhocNumber" type="string" length="45" notnull="false"/>
+			<field name="meetme" type="string" length="5" notnull="false"/>
+			<field name="meetmenum" type="string" length="45" notnull="false"/>
+			<field name="meetmeopts" type="string" length="45" notnull="false"/>
+			<field name="regexten" type="string" length="45" notnull="false"/>
+			<field name="directed_pickup" type="string" notnull="false"/>
+			<field name="directed_pickup_context" type="string" length="100" notnull="false"/>
+			<field name="pickup_modeanswer" type="string" notnull="false"/>
+			<field name="amaflags" type="string" length="45" notnull="false"/>
+			<field name="dnd" type="string" default="reject" notnull="false"/>
+			<field name="videomode" type="string" default="auto" notnull="false"/>
+			<field name="setvar" type="string" length="50" notnull="false"/>
+			<field name="name" type="string" length="40" default="" primarykey="true"/>
+			<field name="phonecodepage" type="string" length="50" notnull="false"/>
+			<key name="id" type="unique">
+				<column name="id"/>
+			</key>
+	 	</table>
 		<table name="sccpbuttonconfig">
 			 <field name="ref" type="string" length="15" default="" primarykey="true"/>
-			 <field name="reftype" type="string" default="sccpdevice" primarykey="true"/>
+			 <field name="reftype" type="string" length="15" default="sccpdevice" primarykey="true"/>
 			 <field name="instance" type="boolean" default="0" primarykey="true"/>
 			 <field name="buttontype" type="string" default="line" primarykey="true"/>
-			 <field name="name" type="string" length="36" default="NULL" notnull="false"/>
-			 <field name="options" type="string" length="100" default="NULL" notnull="false"/>
+			 <field name="name" type="string" length="36" notnull="false"/>
+			 <field name="options" type="string" length="100" notnull="false"/>
 			 <key name="ref" type="index">
 				 <column name="ref"/>
 				 <column name="reftype"/>
@@ -138,31 +138,31 @@
 			 <field name="dns" type="integer" default="1" notnull="false"/>
 			 <field name="buttons" type="integer" default="0" notnull="false"/>
 			 <field name="loadimage" type="string" length="40" default="" notnull="false"/>
-			 <field name="loadinformationid" type="string" length="30" default="NULL" notnull="false"/>
+			 <field name="loadinformationid" type="string" length="30" notnull="false"/>
 			 <field name="enabled" type="integer" default="0" notnull="false"/>
-			 <field name="nametemplate" type="string" length="50" default="NULL" notnull="false"/>
+			 <field name="nametemplate" type="string" length="50" notnull="false"/>
 			 <key name="model" type="index">
 				 <column name="model"/>
 			 </key>
 		 </table>
 		 <table name="sccpuser">
 			 <field name="name" type="string" length="20" primarykey="true"/>
-			 <field name="pin" type="string" length="7" default="NULL" notnull="false"/>
-			 <field name="password" type="string" length="7" default="NULL" notnull="false"/>
-			 <field name="description" type="string" length="45" default="NULL" notnull="false"/>
+			 <field name="pin" type="string" length="7" notnull="false"/>
+			 <field name="password" type="string" length="7" notnull="false"/>
+			 <field name="description" type="string" length="45" notnull="false"/>
 			 <field name="roaminglogin" type="string" default="off" notnull="false"/>
 			 <field name="devicegroup" type="string" length="7"/>
 			 <field name="auto_logout" type="string" default="off" notnull="false"/>
-			 <field name="homedevice" type="string" length="20" default="NULL" notnull="false"/>
+			 <field name="homedevice" type="string" length="20" notnull="false"/>
 			 <key name="name" type="unique">
 				 <column name="name"/>
 			 </key>
 		 </table>
 		 <table name="sccpsettings">
-		    <field name="keyword" type="string" length="50" primarykey="true"/>
-		    <field name="data" type="string" length="255"/>
-		    <field name="seq" type="boolean" primarykey="true"/>
-		    <field name="type" type="boolean" primarykey="true"/>
-		  </table>
+			 <field name="keyword" type="string" length="50" primarykey="true"/>
+			 <field name="data" type="string" length="255"/>
+			 <field name="seq" type="boolean" primarykey="true"/>
+			 <field name="type" type="boolean" primarykey="true"/>
+		 </table>
 	</database>
 </module>