diff --git a/templates/CRM/common/additionalBlocks.tpl b/templates/CRM/common/additionalBlocks.tpl
index d20cadeb4..5dab10a9e 100644
--- a/templates/CRM/common/additionalBlocks.tpl
+++ b/templates/CRM/common/additionalBlocks.tpl
@@ -1,203 +1,208 @@
 {*
- +--------------------------------------------------------------------+
- | CiviCRM version 3.3                                                |
- +--------------------------------------------------------------------+
- | Copyright CiviCRM LLC (c) 2004-2010                                |
- +--------------------------------------------------------------------+
- | This file is a part of CiviCRM.                                    |
- |                                                                    |
- | CiviCRM is free software; you can copy, modify, and distribute it  |
- | under the terms of the GNU Affero General Public License           |
- | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
- |                                                                    |
- | CiviCRM is distributed in the hope that it will be useful, but     |
- | WITHOUT ANY WARRANTY; without even the implied warranty of         |
- | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
- | See the GNU Affero General Public License for more details.        |
- |                                                                    |
- | You should have received a copy of the GNU Affero General Public   |
- | License and the CiviCRM Licensing Exception along                  |
- | with this program; if not, contact CiviCRM LLC                     |
- | at info[AT]civicrm[DOT]org. If you have questions about the        |
- | GNU Affero General Public License or the licensing of CiviCRM,     |
- | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
- +--------------------------------------------------------------------+
-*}
-{literal}
-<script type="text/javascript" >
-cj( function( ) {
-    {/literal}
-    {if $generateAjaxRequest}
-        {foreach from=$ajaxRequestBlocks key="blockName" item="instances"}
-            {foreach from=$instances key="instance" item="active"}
-                buildAdditionalBlocks( '{$blockName}', '{$className}' );
-            {/foreach}  	
-        {/foreach}
-    {/if}
-
-    {if $loadShowHideAddressFields}
-        {foreach from=$showHideAddressFields key="blockId" item="fieldName"}
-           processAddressFields( '{$fieldName}', '{$blockId}', 0 );
-        {/foreach}  
-    {/if}
-    {literal}
-});
-
-function buildAdditionalBlocks( blockName, className ) {
-    var element = blockName + '_Block_';
-
-    //get blockcount of last element of relevant blockName
-    var previousInstance = cj( '[id^="'+ element +'"]:last' ).attr('id').slice( element.length );
-    var currentInstance  = parseInt( previousInstance ) + 1;
-
-    //show primary option if block count = 2
-    if ( currentInstance == 2) {
-        cj("#" + blockName + '-Primary').show( );
-        cj("#" + blockName + '-Primary-html').show( );
-    }
-
-    var dataUrl = {/literal}"{crmURL h=0 q='snippet=4'}"{literal} + '&block=' + blockName + '&count=' + currentInstance;;
-
-    if ( className == 'CRM_Event_Form_ManageEvent_Location' ) {
-        dataUrl = ( currentInstance <= 2 ) ? dataUrl + '&subPage=Location' : '';
-    }
-
-    {/literal}
-    {if $qfKey}    
-        dataUrl += "&qfKey={$qfKey}";
-    {/if}
-    {literal}
-
-    if ( !dataUrl ) {
-        return;
-    }
-
-    var fname = '#' + blockName + '_Block_'+ previousInstance;
-
-    cj('#addMore' + blockName + previousInstance ).hide( );
-    cj.ajax({ 
-        url     : dataUrl,   
-        async   : false,
-        success : function(html){
-            cj(fname).after(html);
-            if( className == 'CRM_Event_Form_ManageEvent_Location' ){
-                // event only support 2 sets of phone and email. refs #20631
-                cj('#add' + blockName).hide();
-            }
-        }
-    });
-
-    if ( blockName == 'Address' ) {
-        checkLocation('address_' + currentInstance + '_location_type_id', true );
-    }
-}
-
-//select single for is_bulk & is_primary
-function singleSelect( object ) {
-    var element = object.split( '_', 3 );
-
-    var block = (element['0'] == 'Address') ? 'Primary' : element['2'].slice('2');
-    var execBlock  = '#' + element['0'] + '-' + block + '-html Input[id*="' + element['2'] + '"]';
-
-    //element to check for checkbox
+    +--------------------------------------------------------------------+
+    | CiviCRM version 3.3                                                |
+    +--------------------------------------------------------------------+
+    | Copyright CiviCRM LLC (c) 2004-2010                                |
+    +--------------------------------------------------------------------+
+    | This file is a part of CiviCRM.                                    |
+    |                                                                    |
+    | CiviCRM is free software; you can copy, modify, and distribute it  |
+    | under the terms of the GNU Affero General Public License           |
+    | Version 3, 19 November 2007 and the CiviCRM Licensing Exception.   |
+    |                                                                    |
+    | CiviCRM is distributed in the hope that it will be useful, but     |
+    | WITHOUT ANY WARRANTY; without even the implied warranty of         |
+    | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.               |
+    | See the GNU Affero General Public License for more details.        |
+    |                                                                    |
+    | You should have received a copy of the GNU Affero General Public   |
+    | License and the CiviCRM Licensing Exception along                  |
+    | with this program; if not, contact CiviCRM LLC                     |
+    | at info[AT]civicrm[DOT]org. If you have questions about the        |
+    | GNU Affero General Public License or the licensing of CiviCRM,     |
+    | see the CiviCRM license FAQ at http://civicrm.org/licensing        |
+    +--------------------------------------------------------------------+
+   *}
+   {literal}
+   <script type="text/javascript" >
+   cj( function( ) {
+       {/literal}
+       {if $generateAjaxRequest}
+           {foreach from=$ajaxRequestBlocks key="blockName" item="instances"}
+               {foreach from=$instances key="instance" item="active"}
+                buildAdditionalBlocks( '{$blockName}', '{$className}' , '{$instance}' );
+               {/foreach}
+           {/foreach}
+       {/if}
+   
+       {if $loadShowHideAddressFields}
+           {foreach from=$showHideAddressFields key="blockId" item="fieldName"}
+              processAddressFields( '{$fieldName}', '{$blockId}', 0 );
+           {/foreach}  
+       {/if}
+       {literal}
+   });
+   
+function buildAdditionalBlocks( blockName, className , $instance = null ) {
+       var element = blockName + '_Block_';
+   
+       //get blockcount of last element of relevant blockName
+       var previousInstance = cj( '[id^="'+ element +'"]:last' ).attr('id').slice( element.length );
+       if (!$instance) {
+           var currentInstance  = parseInt( previousInstance ) + 1;
+       } else {
+           var currentInstance = $instance;
+       }
+   
+       //show primary option if block count = 2
+       if ( currentInstance == 2) {
+           cj("#" + blockName + '-Primary').show( );
+           cj("#" + blockName + '-Primary-html').show( );
+       }
+   
+       var dataUrl = {/literal}"{crmURL h=0 q='snippet=4'}"{literal} + '&block=' + blockName + '&count=' + currentInstance;;
+   
+       if ( className == 'CRM_Event_Form_ManageEvent_Location' ) {
+           dataUrl = ( currentInstance <= 2 ) ? dataUrl + '&subPage=Location' : '';
+       }
+   
+       {/literal}
+       {if $qfKey}    
+           dataUrl += "&qfKey={$qfKey}";
+       {/if}
+       {literal}
+   
+       if ( !dataUrl ) {
+           return;
+       }
+   
+       var fname = '#' + blockName + '_Block_'+ previousInstance;
+   
+       cj('#addMore' + blockName + previousInstance ).hide( );
+       cj.ajax({ 
+           url     : dataUrl,   
+           async   : false,
+           success : function(html){
+               cj(fname).after(html);
+               if( className == 'CRM_Event_Form_ManageEvent_Location' ){
+                   // event only support 2 sets of phone and email. refs #20631
+                   cj('#add' + blockName).hide();
+               }
+           }
+       });
+   
+       if ( blockName == 'Address' ) {
+           checkLocation('address_' + currentInstance + '_location_type_id', true );
+       }
+   }
+   
+   //select single for is_bulk & is_primary
+   function singleSelect( object ) {
+       var element = object.split( '_', 3 );
+   
+       var block = (element['0'] == 'Address') ? 'Primary' : element['2'].slice('2');
+       var execBlock  = '#' + element['0'] + '-' + block + '-html Input[id*="' + element['2'] + '"]';
+   
+       //element to check for checkbox
     var elementChecked =  cj( '#' + object ).prop('checked');
-    if ( elementChecked ) {
-        cj( execBlock ).each( function() {
-            if ( cj(this).attr('id') != object ) {
+       if ( elementChecked ) {
+           cj( execBlock ).each( function() {
+               if ( cj(this).attr('id') != object ) {
                 cj(this).prop( 'checked', false );
-            }
-        });
-    } else {
+               }
+           });
+       } else {
         cj( '#' + object ).prop( 'checked', false );
-    }
-
-	//check if non of elements is set Primary / Allowed to Login.
-	if( cj.inArray( element['2'].slice('2'), [ 'Primary', 'Login', 'Billing' ] ) != -1 ) {
-		primary = false;
-		cj( execBlock ).each( function( ) { 
-			if ( cj(this).attr( 'checked' ) ) {
-				primary = true;
-			}
-		});
-		if( ! primary ) {
+       }
+   
+       //check if non of elements is set Primary / Allowed to Login.
+       if( cj.inArray( element['2'].slice('2'), [ 'Primary', 'Login', 'Billing' ] ) != -1 ) {
+           primary = false;
+           cj( execBlock ).each( function( ) { 
+               if ( cj(this).attr( 'checked' ) ) {
+                   primary = true;
+               }
+           });
+           if( ! primary ) {
 			cj('#' + object).prop( 'checked', true );
-		}
-	}
-}
-
-function removeBlock( blockName, blockId ) {
-    var element = cj("#addressBlock > div").size();
-    if ( ( blockName == 'Address' ) && element == 1 ) {
-      return clearFirstBlock(blockName , blockId);
-    }
-
-    if ( cj( "#"+ blockName + "_" + blockId + "_IsPrimary").attr('checked') ) {
-       	var primaryBlockId = 1;
-        // consider next block as a primary,
-        // when user delete first block 
-        if ( blockId >= 1 ) {
-           var blockIds = getAddressBlock('next');
-           for ( var i = 0; i <= blockIds.length; i++) {
-               var curBlockId = blockIds[i];
-	           if ( curBlockId != blockId ) {
-	               primaryBlockId = curBlockId;
-	               break;
-	           }
-            }  
-        } 
-    
-        // finally sets the primary address
-        cj( '#'+ blockName + '_' + primaryBlockId + '_IsPrimary').attr('checked', true);
-    }
-    
-    //remove the spacer for address block only.
-    if ( blockName == 'Address' && cj( "#"+ blockName + "_Block_" + blockId ).prev().attr('class') == 'spacer' ){
-        cj( "#"+ blockName + "_Block_" + blockId ).prev().remove();
-    }
-
-    //unset block from html
-    cj( "#"+ blockName + "_Block_" + blockId ).empty().remove();
-
-    // show for event manage location page. refs #20631
-    cj("#add" + blockName).show();
-
-    //show the link 'add address' to last element of Address Block
-    if ( blockName == 'Address' ) {
-        var lastAddressBlock = cj('div[id^=Address_Block_]').last().attr('id');
-        var lastBlockId = lastAddressBlock.split( '_' );
-        if ( lastBlockId[2] ) {
-            cj( '#addMoreAddress' + lastBlockId[2] ).show();
-        } 
-    }
-}
-
-function clearFirstBlock( blockName , blockId ) {
-    var element =  blockName + '_Block_' + blockId;
-    cj("#" + element +" input, " + "#" + element + " select").each(function () {
-        cj(this).val(''); 
-    });
-    cj("#addressBlockId").removeClass('crm-accordion-open').addClass('crm-accordion-closed');
-}
-
-function getAddressBlock( position ) {
-   var addressBlockIds = new Array();
-   var i = 0;
-   switch ( position ) {
-        case 'last':
-              var lastBlockInfo = cj("#addressBlockId > div").children(':last').attr('id').split( '_', 3);
-              addressBlockIds[i] = lastBlockInfo['2'];
-              break;
-        case 'next':
-              cj("#addressBlockId > div").children().each( function() {
-                  if ( cj(this).attr('id') ) {    
-                     var blockInfo = cj(this).attr('id').split( '_', 3);
-                     addressBlockIds[i] = blockInfo['2'];
-                     i++;
+           }
+       }
+   }
+   
+   function removeBlock( blockName, blockId ) {
+       var element = cj("#addressBlock > div").size();
+       if ( ( blockName == 'Address' ) && element == 1 ) {
+         return clearFirstBlock(blockName , blockId);
+       }
+   
+       if ( cj( "#"+ blockName + "_" + blockId + "_IsPrimary").attr('checked') ) {
+              var primaryBlockId = 1;
+           // consider next block as a primary,
+           // when user delete first block 
+           if ( blockId >= 1 ) {
+              var blockIds = getAddressBlock('next');
+              for ( var i = 0; i <= blockIds.length; i++) {
+                  var curBlockId = blockIds[i];
+                  if ( curBlockId != blockId ) {
+                      primaryBlockId = curBlockId;
+                      break;
                   }
-              });
-              break;
+               }  
+           } 
+       
+           // finally sets the primary address
+           cj( '#'+ blockName + '_' + primaryBlockId + '_IsPrimary').attr('checked', true);
+       }
+       
+       //remove the spacer for address block only.
+       if ( blockName == 'Address' && cj( "#"+ blockName + "_Block_" + blockId ).prev().attr('class') == 'spacer' ){
+           cj( "#"+ blockName + "_Block_" + blockId ).prev().remove();
+       }
+   
+       //unset block from html
+       cj( "#"+ blockName + "_Block_" + blockId ).empty().remove();
+   
+       // show for event manage location page. refs #20631
+       cj("#add" + blockName).show();
+   
+       //show the link 'add address' to last element of Address Block
+       if ( blockName == 'Address' ) {
+           var lastAddressBlock = cj('div[id^=Address_Block_]').last().attr('id');
+           var lastBlockId = lastAddressBlock.split( '_' );
+           if ( lastBlockId[2] ) {
+               cj( '#addMoreAddress' + lastBlockId[2] ).show();
+           } 
+       }
+   }
+   
+   function clearFirstBlock( blockName , blockId ) {
+       var element =  blockName + '_Block_' + blockId;
+       cj("#" + element +" input, " + "#" + element + " select").each(function () {
+           cj(this).val(''); 
+       });
+       cj("#addressBlockId").removeClass('crm-accordion-open').addClass('crm-accordion-closed');
+   }
+   
+   function getAddressBlock( position ) {
+      var addressBlockIds = new Array();
+      var i = 0;
+      switch ( position ) {
+           case 'last':
+                 var lastBlockInfo = cj("#addressBlockId > div").children(':last').attr('id').split( '_', 3);
+                 addressBlockIds[i] = lastBlockInfo['2'];
+                 break;
+           case 'next':
+                 cj("#addressBlockId > div").children().each( function() {
+                     if ( cj(this).attr('id') ) {    
+                        var blockInfo = cj(this).attr('id').split( '_', 3);
+                        addressBlockIds[i] = blockInfo['2'];
+                        i++;
+                     }
+                 });
+                 break;
+      }
+      return addressBlockIds;
    }
-   return addressBlockIds;
-}
-</script>
-{/literal}
+   </script>
+   {/literal}
+   
\ No newline at end of file