diff --git a/resources/templates/provision/atcom/ag198/{$mac}.cfg b/resources/templates/provision/atcom/ag198/{$mac}.cfg
index 03ef25e8fd..34cc26b25b 100644
--- a/resources/templates/provision/atcom/ag198/{$mac}.cfg
+++ b/resources/templates/provision/atcom/ag198/{$mac}.cfg
@@ -1,4 +1,4 @@
-<<VOIP CONFIG FILE>>Version:2.0002                            
+<<VOIP CONFIG FILE>>Version:2.0002
 
 <GLOBAL CONFIG MODULE>
 Static IP          :
diff --git a/resources/templates/provision/digium/d50/${mac}.cfg b/resources/templates/provision/digium/d50/${mac}.cfg
index 7417600ec3..bff83639c5 100644
--- a/resources/templates/provision/digium/d50/${mac}.cfg
+++ b/resources/templates/provision/digium/d50/${mac}.cfg
@@ -48,12 +48,12 @@
 	<setting id="rtp_dscp" value="46" />
 	<contacts url="https://server.example.com/myfile.xml" id="internal" md5="abcd123" />
 	<accounts>
-		
+
 		<account index="1" status="1" register="1" account_id="1000" username="1000" authname="1000" password="USER-PASSWORD" passcode="USER-PASSWORD" line_label="USER-LINE-NAME" caller_id="CNAM" dial_plan="[0-8]xxxxx|911|9411|9611|9011xxx.T3|91xxxxxxxxxx|9[2-9]xxxxxx|*xx.T3|[0-8]xx.T3" visual_voicemail="0" voicemail="sip:*97@SERVER-IP-OR-DOMAIN" outbound_proxy="" outbound_port="5060" conflict="replace">
 			<host_primary server="SERVER IP" port="5060" transport="udp" reregister="3600" retry="25" num_retries="5" />
 			<permission id="record_own_calls" value="0" />
 		</account>
-		
+
 	</accounts>
 	<codecs>
 		<codec id="PCMU" priority="255" packetization="20" jitter_min="0" jitter_max="0" jitter_target="0" enabled="1" />
diff --git a/resources/templates/provision/linksys/spa2102/{$mac}.xml b/resources/templates/provision/linksys/spa2102/{$mac}.xml
index 958ea5994e..c7b739aada 100644
--- a/resources/templates/provision/linksys/spa2102/{$mac}.xml
+++ b/resources/templates/provision/linksys/spa2102/{$mac}.xml
@@ -25,7 +25,7 @@
 <Preferred_Codec_1_>G729a</Preferred_Codec_1_>
 <Register_Expires_1_>{$register_expires_1}</Register_Expires_1_><!--*9 will perform intercom and call the other line on the box. There is no other way, from my testing to call from jack to jack on the box, without without the media being proxied.-->
 <Dial_Plan_1_>
-(1xxx[2-9]xxxxxxS0|[*#x]x.)  
+(1xxx[2-9]xxxxxxS0|[*#x]x.)
 </Dial_Plan_1_>
 <!--|&lt;*9:{$user_id_2}@127.0.0.1:5061&gt;-->
 <Line_Enable_2_>yes</Line_Enable_2_>
@@ -37,7 +37,7 @@
 <Preferred_Codec_2_>G729a</Preferred_Codec_2_>
 <Register_Expires_2_>{$register_expires_2}</Register_Expires_2_>
 <Dial_Plan_2_>
-(1xxx[2-9]xxxxxxS0|[*#x]x.) 
+(1xxx[2-9]xxxxxxS0|[*#x]x.)
 </Dial_Plan_2_><!--|&lt;*9:{$user_id_1}@127.0.0.1:5061&gt;-->
 
 
@@ -47,7 +47,7 @@
 <G729a_Codec_Name>G729</G729a_Codec_Name> <!--suggestion by Callcentric.-->
 <G729b_Codec_Name>G729</G729b_Codec_Name> <!--suggestion by Callcentric.-->
 
-<!-- NAT_Settings 
+<!-- NAT_Settings
 <NAT_Mapping_Enable_1_>yes</NAT_Mapping_Enable_1_>
 <NAT_Keep_Alive_Enable_1_>yes</NAT_Keep_Alive_Enable_1_>
 <NAT_Keep_Alive_Msg_1_>$NOTIFY</NAT_Keep_Alive_Msg_1_>
diff --git a/resources/templates/provision/snom/7xx/{$mac}.xml b/resources/templates/provision/snom/7xx/{$mac}.xml
index 08dafb4a42..41b64a3b7f 100644
--- a/resources/templates/provision/snom/7xx/{$mac}.xml
+++ b/resources/templates/provision/snom/7xx/{$mac}.xml
@@ -37,7 +37,7 @@
 <user_name idx="1" perm="">{$user_id_1}</user_name>
 <user_pass idx="1" perm="">{$user_password_1}</user_pass>
 <user_host idx="1" perm="">{$server_address_1}:{$sip_port_1};transport={$sip_transport_1}</user_host>
-<user_subscription_expiry idx="1" perm="">{$register_expires_1}</user_subscription_expiry>  
+<user_subscription_expiry idx="1" perm="">{$register_expires_1}</user_subscription_expiry>
 <user_server_type idx="1" perm="">Default</user_server_type>
 <user_srtp idx="1" perm="">off</user_srtp>
 <user_mailbox idx="1" perm="">*97</user_mailbox>
@@ -45,7 +45,7 @@
 <user_name idx="2" perm="">{$user_id_2}</user_name>
 <user_pass idx="2" perm="">{$user_password_2}</user_pass>
 <user_host idx="2" perm="">{$server_address_2}:{$sip_port_2};transport={$sip_transport_2}</user_host>
-<user_subscription_expiry idx="2" perm="">{$register_expires_2}</user_subscription_expiry>  
+<user_subscription_expiry idx="2" perm="">{$register_expires_2}</user_subscription_expiry>
 <user_server_type idx="2" perm="">Default</user_server_type>
 <user_srtp idx="2" perm="">off</user_srtp>
 <user_mailbox idx="2" perm="">*97</user_mailbox>
@@ -53,7 +53,7 @@
 <user_name idx="3" perm="">{$user_id_3}</user_name>
 <user_pass idx="3" perm="">{$user_password_3}</user_pass>
 <user_host idx="3" perm="">{$server_address_3}:{$sip_port_3};transport={$sip_transport_3}</user_host>
-<user_subscription_expiry idx="3" perm="">{$register_expires_3}</user_subscription_expiry>  
+<user_subscription_expiry idx="3" perm="">{$register_expires_3}</user_subscription_expiry>
 <user_server_type idx="3" perm="">Default</user_server_type>
 <user_srtp idx="3" perm="">off</user_srtp>
 <user_mailbox idx="3" perm="">*97</user_mailbox>
@@ -61,7 +61,7 @@
 <user_name idx="4" perm="">{$user_id_4}</user_name>
 <user_pass idx="4" perm="">{$user_password_4}</user_pass>
 <user_host idx="4" perm="">{$server_address_4}:{$sip_port_4};transport={$sip_transport_4}</user_host>
-<user_subscription_expiry idx="4" perm="">{$register_expires_4}</user_subscription_expiry>  
+<user_subscription_expiry idx="4" perm="">{$register_expires_4}</user_subscription_expiry>
 <user_server_type idx="4" perm="">Default</user_server_type>
 <user_srtp idx="4" perm="">off</user_srtp>
 <user_mailbox idx="4" perm="">*97</user_mailbox>
@@ -69,7 +69,7 @@
 <user_name idx="5" perm="">{$user_id_5}</user_name>
 <user_pass idx="5" perm="">{$user_password_5}</user_pass>
 <user_host idx="5" perm="">{$server_address_5}:{$sip_port_5};transport={$sip_transport_5}</user_host>
-<user_subscription_expiry idx="5" perm="">{$register_expires_5}</user_subscription_expiry>  
+<user_subscription_expiry idx="5" perm="">{$register_expires_5}</user_subscription_expiry>
 <user_server_type idx="5" perm="">Default</user_server_type>
 <user_srtp idx="5" perm="">off</user_srtp>
 <user_mailbox idx="5" perm="">*97</user_mailbox>