diff --git a/etc/espiDerived.xsd b/etc/espiDerived.xsd
index 13410a41..33a88857 100755
--- a/etc/espiDerived.xsd
+++ b/etc/espiDerived.xsd
@@ -4,7 +4,7 @@
 	<!-- 
 ==========================================================================
  Schema: espiDerived.xsd
-    Version: 0.7.20150119     
+    Version: 0.7.20150225     
     Author: Ron Pasquarelli & Marty Burns (Hypertek for NIST), John Teeter (for NIST), Don Coffin (Remi Networks)
 ========================================================================== 
 
@@ -142,7 +142,7 @@ self link to this resource</xs:documentation>
 							<xs:documentation>URI of the Scope Selection Screen used by the Retail Customer to select the characteristics of the Green Button data to be shared with the ThirdParty.  (e.g. "https://services.greenbuttondata.org/ThirdParty/espi/1_1/RetailCustomer/ScopeSelection")</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="thirdPartyUserPortalScreenURI" type="xs:anyURI">
+					<xs:element name="thirdPartyUserPortalScreenURI" type="xs:anyURI" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>URI of a Third Party’s web page for use with Green Button Connect My Data (e.g. "https://services.greenbuttondata.org/ThirdParty/espi/1_1/home")</xs:documentation>
 						</xs:annotation>
@@ -163,7 +163,7 @@ self link to this resource</xs:documentation>
 							<xs:documentation>The name of the application to which access will be granted (OAuth client_name). (e.g. "Green Button ThirdParty")</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="client_uri" type="xs:anyURI">
+					<xs:element name="client_uri" type="xs:anyURI" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>The link to the main page of the application (OAuth client_uri). (e.g. "https://services.greenbuttondata.org/ThirdParty")</xs:documentation>
 						</xs:annotation>
@@ -268,12 +268,12 @@ Note: for privacy there is no identifier of the RetailCustomer in this structure
 		<xs:complexContent>
 			<xs:extension base="IdentifiedObject">
 				<xs:sequence>
-					<xs:element name="authorizedPeriod" type="DateTimeInterval">
+					<xs:element name="authorizedPeriod" type="DateTimeInterval" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>Restricts access to requests or subscriptions within this date time interval. (e.g. "duration=31536000,start=1333252800")</xs:documentation>
 						</xs:annotation>
 					</xs:element>
-					<xs:element name="publishedPeriod" type="DateTimeInterval">
+					<xs:element name="publishedPeriod" type="DateTimeInterval" minOccurs="0">
 						<xs:annotation>
 							<xs:documentation>Restricts access to the objects within the associated resource that were published within this date time interval. (e.g. "duration=31536000" for most recent 365 days)</xs:documentation>
 						</xs:annotation>
diff --git a/etc/prepopulatesql_applicationinformation_dc.sql b/etc/prepopulatesql_applicationinformation_dc.sql
index 16ebab8f..ea4cf620 100644
--- a/etc/prepopulatesql_applicationinformation_dc.sql
+++ b/etc/prepopulatesql_applicationinformation_dc.sql
@@ -1,8 +1,8 @@
 /* Add application_information */ 
 INSERT INTO `application_information` (`id`, `kind`, `description`, `published`, `self_link_href`, `self_link_rel`, `up_link_href`, `up_link_rel`, `updated`, `uuid`, `authorizationServerAuthorizationEndpoint`, `authorizationServerRegistrationEndpoint`, `authorizationServerTokenEndpoint`, `authorizationServerUri`, `clientId`, `clientIdIssuedAt`, `clientName`, `clientSecret`, `clientSecretExpiresAt`, `clientUri`, `contacts`, `dataCustodianApplicationStatus`, `dataCustodianBulkRequestURI`, `dataCustodianDefaultBatchResource`, `dataCustodianDefaultSubscriptionResource`, `dataCustodianId`, `dataCustodianResourceEndpoint`, `dataCustodianThirdPartySelectionScreenURI`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'DATA_CUSTODIAN_ADMIN', 'GreenButtonData.org  Data Custodian Admin Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F5', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'data_custodian_admin', 1403190000, 'Green Button DataCustodian Admin', 'secret', 0, 'http://localhost:8080/DataCustodian','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/{retailCustomerId}/ThirdPartyList', NULL, NULL, NULL, NULL, NULL, 1, 'EnergyOS OpenESPI', '1.2', 'EnergyOS OpenESPI Example DataCustodian Admin', 'Data Custodian Admin (localhost)', '1', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelection'),
-(2, 'THIRD_PARTY', 'GreenButtonData.org  ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/2', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'Green Button Third Party', 'secret', 0, 'http://localhost:8080/ThirdParty', 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8080/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8080/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8080/ThirdParty/login', 'http://localhost:8080/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8080/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList'),
-(3, 'UPLOAD_ADMIN', 'GreenButtonData.org  MDM Upload Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/3', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F7', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'upload_admin', 1403190000, 'Green Button DMD Upload Service', 'secret', 0, NULL, 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', NULL, NULL, NULL, NULL, NULL, 1, 'EnergyOS OpenESPI DMD Upload Service', '1.2', 'EnergyOS OpenESPI DMD Upload Service', 'MDM Upload (localhost)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, NULL);
+(1, 'DATA_CUSTODIAN_ADMIN', 'GreenButtonData.org  Data Custodian Admin Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F5', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'data_custodian_admin', 1403190000, 'Green Button DataCustodian Admin', 'secret', 0, 'http://localhost:8080/DataCustodian','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/{retailCustomerId}/ThirdPartyList', NULL, NULL, NULL, NULL, 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/1', 1, 'EnergyOS OpenESPI', '1.2', 'EnergyOS OpenESPI Example DataCustodian Admin', 'Data Custodian Admin (localhost)', '1', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelection'),
+(2, 'THIRD_PARTY', 'GreenButtonData.org  ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/2', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'Green Button Third Party', 'secret', 0, 'http://localhost:8080/ThirdParty', 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8080/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8080/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8080/ThirdParty/login', 'http://localhost:8080/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8080/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList'),
+(3, 'UPLOAD_ADMIN', 'GreenButtonData.org  MDM Upload Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/3', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F7', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'upload_admin', 1403190000, 'Green Button DMD Upload Service', 'secret', 0, NULL, 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', NULL, NULL, NULL, NULL, 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/3', 1, 'EnergyOS OpenESPI DMD Upload Service', '1.2', 'EnergyOS OpenESPI DMD Upload Service', 'MDM Upload (localhost)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, NULL);
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_19_32_33_34_35_36_37_38_41_44_45');
@@ -20,13 +20,13 @@ INSERT INTO application_information_grant_types (application_information_id, gra
 
 /* Add predefined authorizations */
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/',NULL,'DataCustodian_Admin_Access',NULL,'1','data_custodian_admin',0,1,0,1);
+VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/',NULL,'FB=34_35,FB=45',NULL,'1','data_custodian_admin',0,1,0,1);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,2,0,2);
+VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,2,0,2);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'Upload_Admin_Access',NULL,'1','upload_admin',0,1,0,3);
+VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'FB=45',NULL,'1','upload_admin',0,1,0,3);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,2,0,4);
+VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,2,0,4);
 INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id) 
 VALUES (1,NULL,'2014-05-22 12:15:41',NULL,'self',NULL,'up','2014-05-22 12:15:41','9583C81D-9468-440D-AEF4-27138A5EAC54','0c0c2ee9-c988-43ba-9bef-e798b5049a5a','2014-05-22 12:15:41',1,1,0);
 INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id) 
diff --git a/etc/prepopulatesql_applicationinformation_dc_localhost443.sql b/etc/prepopulatesql_applicationinformation_dc_localhost443.sql
index 131f1735..93aee0d8 100644
--- a/etc/prepopulatesql_applicationinformation_dc_localhost443.sql
+++ b/etc/prepopulatesql_applicationinformation_dc_localhost443.sql
@@ -1,8 +1,8 @@
 /* Add application_information */ 
 INSERT INTO `application_information` (`id`, `kind`, `description`, `published`, `self_link_href`, `self_link_rel`, `up_link_href`, `up_link_rel`, `updated`, `uuid`, `authorizationServerAuthorizationEndpoint`, `authorizationServerRegistrationEndpoint`, `authorizationServerTokenEndpoint`, `authorizationServerUri`, `clientId`, `clientIdIssuedAt`, `clientName`, `clientSecret`, `clientSecretExpiresAt`, `clientUri`, `contacts`, `dataCustodianApplicationStatus`, `dataCustodianBulkRequestURI`, `dataCustodianDefaultBatchResource`, `dataCustodianDefaultSubscriptionResource`, `dataCustodianId`, `dataCustodianResourceEndpoint`, `dataCustodianThirdPartySelectionScreenURI`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'DATA_CUSTODIAN_ADMIN', 'GreenButtonData.org  Data Custodian Admin Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F5', 'https://localhost/DataCustodian/oauth/authorize', 'https://localhost/DataCustodian/espi/1_1/register', 'https://localhost/DataCustodian/oauth/token', 'https://localhost/DataCustodian/', 'data_custodian_admin', 1403190000, 'Green Button DataCustodian Admin', 'secret', 0, 'https://localhost/DataCustodian','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://localhost/DataCustodian/espi/1_1/resource/Batch', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://localhost/DataCustodian/espi/1_1/resource', 'https://localhost/DataCustodian/RetailCustomer/{retailCustomerId}/ThirdPartyList', NULL, NULL, NULL, NULL, NULL, 1, 'EnergyOS OpenESPI', '1.2', 'EnergyOS OpenESPI Example DataCustodian Admin', 'Data Custodian Admin (localhost)', '1', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, 'https://localhost/DataCustodian/RetailCustomer/ScopeSelection'),
-(2, 'THIRD_PARTY', 'GreenButtonData.org  ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/2', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'https://localhost/DataCustodian/oauth/authorize', 'https://localhost/DataCustodian/espi/1_1/register', 'https://localhost/DataCustodian/oauth/token', 'https://localhost/DataCustodian/', 'third_party', 1403190000, 'Green Button Third Party', 'secret', 0, 'https://localhost/ThirdParty', 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://localhost/DataCustodian/espi/1_1/resource/Batch', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://localhost/DataCustodian/espi/1_1/resource', 'https://localhost/DataCustodian/RetailCustomer/1/ThirdPartyList', 'https://localhost/ThirdParty/resources/ico/favicon.png', NULL, 'https://localhost/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'https://localhost/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'https://localhost/ThirdParty/login', 'https://localhost/ThirdParty/espi/1_1/Notification', NULL, 'https://localhost/ThirdParty/RetailCustomer/ScopeSelection', 'https://localhost/ThirdParty', 'client_secret_basic', NULL, 'https://localhost/DataCustodian/RetailCustomer/ScopeSelectionList'),
-(3, 'UPLOAD_ADMIN', 'GreenButtonData.org  MDM Upload Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/3', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F7', 'https://localhost/DataCustodian/oauth/authorize', 'https://localhost/DataCustodian/espi/1_1/register', 'https://localhost/DataCustodian/oauth/token', 'https://localhost/DataCustodian/', 'upload_admin', 1403190000, 'Green Button DMD Upload Service', 'secret', 0, NULL, 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://localhost/DataCustodian/espi/1_1/resource/Batch', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://localhost/DataCustodian/espi/1_1/resource', 'https://localhost/DataCustodian/RetailCustomer/1/ThirdPartyList', NULL, NULL, NULL, NULL, NULL, 1, 'EnergyOS OpenESPI DMD Upload Service', '1.2', 'EnergyOS OpenESPI DMD Upload Service', 'MDM Upload (localhost)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, NULL);
+(1, 'DATA_CUSTODIAN_ADMIN', 'GreenButtonData.org  Data Custodian Admin Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F5', 'https://localhost/DataCustodian/oauth/authorize', 'https://localhost/DataCustodian/espi/1_1/register', 'https://localhost/DataCustodian/oauth/token', 'https://localhost/DataCustodian/', 'data_custodian_admin', 1403190000, 'Green Button DataCustodian Admin', 'secret', 0, 'https://localhost/DataCustodian','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://localhost/DataCustodian/espi/1_1/resource/Batch', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://localhost/DataCustodian/espi/1_1/resource', 'https://localhost/DataCustodian/RetailCustomer/{retailCustomerId}/ThirdPartyList', NULL, NULL, NULL, NULL, 'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/1', 1, 'EnergyOS OpenESPI', '1.2', 'EnergyOS OpenESPI Example DataCustodian Admin', 'Data Custodian Admin (localhost)', '1', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, 'https://localhost/DataCustodian/RetailCustomer/ScopeSelection'),
+(2, 'THIRD_PARTY', 'GreenButtonData.org  ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/2', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'https://localhost/DataCustodian/oauth/authorize', 'https://localhost/DataCustodian/espi/1_1/register', 'https://localhost/DataCustodian/oauth/token', 'https://localhost/DataCustodian/', 'third_party', 1403190000, 'Green Button Third Party', 'secret', 0, 'https://localhost/ThirdParty', 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://localhost/DataCustodian/espi/1_1/resource/Batch', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://localhost/DataCustodian/espi/1_1/resource', 'https://localhost/DataCustodian/RetailCustomer/1/ThirdPartyList', 'https://localhost/ThirdParty/resources/ico/favicon.png', NULL, 'https://localhost/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'https://localhost/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'https://localhost/ThirdParty/login', 'https://localhost/ThirdParty/espi/1_1/Notification', NULL, 'https://localhost/ThirdParty/RetailCustomer/ScopeSelection', 'https://localhost/ThirdParty', 'client_secret_basic', NULL, 'https://localhost/DataCustodian/RetailCustomer/ScopeSelectionList'),
+(3, 'UPLOAD_ADMIN', 'GreenButtonData.org  MDM Upload Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/3', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F7', 'https://localhost/DataCustodian/oauth/authorize', 'https://localhost/DataCustodian/espi/1_1/register', 'https://localhost/DataCustodian/oauth/token', 'https://localhost/DataCustodian/', 'upload_admin', 1403190000, 'Green Button DMD Upload Service', 'secret', 0, NULL, 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://localhost/DataCustodian/espi/1_1/resource/Batch', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://localhost/DataCustodian/espi/1_1/resource', 'https://localhost/DataCustodian/RetailCustomer/1/ThirdPartyList', NULL, NULL, NULL, NULL, 'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/3', 1, 'EnergyOS OpenESPI DMD Upload Service', '1.2', 'EnergyOS OpenESPI DMD Upload Service', 'MDM Upload (localhost)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, NULL);
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_19_32_33_34_35_36_37_38_41_44_45');
@@ -16,17 +16,18 @@ INSERT INTO application_information_scopes (application_information_id, scope) V
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (1, 'CLIENT_CREDENTIALS');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'AUTHORIZATION_CODE');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'REFRESH_TOKEN');
+INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'CLIENT_CREDENTIALS');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (3, 'CLIENT_CREDENTIALS');
 
 /* Add predefined authorizations */
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','https://localhost/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/',NULL,'DataCustodian_Admin_Access',NULL,'1','data_custodian_admin',0,1,0,1);
+VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','https://localhost/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/',NULL,'FB=34_35,FB=45',NULL,'1','data_custodian_admin',0,1,0,1);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','https://localhost/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,2,0,2);
+VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','https://localhost/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,2,0,2);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','https://localhost/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'Upload_Admin_Access',NULL,'1','upload_admin',0,1,0,3);
+VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','https://localhost/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'FB=45',NULL,'1','upload_admin',0,1,0,3);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','https://localhost/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,2,0,4);
+VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','https://localhost/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,2,0,4);
 INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id) 
 VALUES (1,NULL,'2014-05-22 12:15:41',NULL,'self',NULL,'up','2014-05-22 12:15:41','9583C81D-9468-440D-AEF4-27138A5EAC54','0c0c2ee9-c988-43ba-9bef-e798b5049a5a','2014-05-22 12:15:41',1,1,0);
 INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id) 
diff --git a/etc/prepopulatesql_applicationinformation_dc_localhost8080.sql b/etc/prepopulatesql_applicationinformation_dc_localhost8080.sql
index 16ebab8f..862043f9 100755
--- a/etc/prepopulatesql_applicationinformation_dc_localhost8080.sql
+++ b/etc/prepopulatesql_applicationinformation_dc_localhost8080.sql
@@ -1,8 +1,8 @@
 /* Add application_information */ 
 INSERT INTO `application_information` (`id`, `kind`, `description`, `published`, `self_link_href`, `self_link_rel`, `up_link_href`, `up_link_rel`, `updated`, `uuid`, `authorizationServerAuthorizationEndpoint`, `authorizationServerRegistrationEndpoint`, `authorizationServerTokenEndpoint`, `authorizationServerUri`, `clientId`, `clientIdIssuedAt`, `clientName`, `clientSecret`, `clientSecretExpiresAt`, `clientUri`, `contacts`, `dataCustodianApplicationStatus`, `dataCustodianBulkRequestURI`, `dataCustodianDefaultBatchResource`, `dataCustodianDefaultSubscriptionResource`, `dataCustodianId`, `dataCustodianResourceEndpoint`, `dataCustodianThirdPartySelectionScreenURI`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'DATA_CUSTODIAN_ADMIN', 'GreenButtonData.org  Data Custodian Admin Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F5', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'data_custodian_admin', 1403190000, 'Green Button DataCustodian Admin', 'secret', 0, 'http://localhost:8080/DataCustodian','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/{retailCustomerId}/ThirdPartyList', NULL, NULL, NULL, NULL, NULL, 1, 'EnergyOS OpenESPI', '1.2', 'EnergyOS OpenESPI Example DataCustodian Admin', 'Data Custodian Admin (localhost)', '1', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelection'),
-(2, 'THIRD_PARTY', 'GreenButtonData.org  ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/2', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'Green Button Third Party', 'secret', 0, 'http://localhost:8080/ThirdParty', 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8080/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8080/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8080/ThirdParty/login', 'http://localhost:8080/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8080/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList'),
-(3, 'UPLOAD_ADMIN', 'GreenButtonData.org  MDM Upload Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/3', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F7', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'upload_admin', 1403190000, 'Green Button DMD Upload Service', 'secret', 0, NULL, 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', NULL, NULL, NULL, NULL, NULL, 1, 'EnergyOS OpenESPI DMD Upload Service', '1.2', 'EnergyOS OpenESPI DMD Upload Service', 'MDM Upload (localhost)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, NULL);
+(1, 'DATA_CUSTODIAN_ADMIN', 'GreenButtonData.org  Data Custodian Admin Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F5', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'data_custodian_admin', 1403190000, 'Green Button DataCustodian Admin', 'secret', 0, 'http://localhost:8080/DataCustodian','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/{retailCustomerId}/ThirdPartyList', NULL, NULL, NULL, NULL, 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/1', 1, 'EnergyOS OpenESPI', '1.2', 'EnergyOS OpenESPI Example DataCustodian Admin', 'Data Custodian Admin (localhost)', '1', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelection'),
+(2, 'THIRD_PARTY', 'GreenButtonData.org  ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/2', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'Green Button Third Party', 'secret', 0, 'http://localhost:8080/ThirdParty', 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8080/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8080/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8080/ThirdParty/login', 'http://localhost:8080/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8080/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList'),
+(3, 'UPLOAD_ADMIN', 'GreenButtonData.org  MDM Upload Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/3', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F7', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'upload_admin', 1403190000, 'Green Button DMD Upload Service', 'secret', 0, NULL, 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', NULL, NULL, NULL, NULL, 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/3', 1, 'EnergyOS OpenESPI DMD Upload Service', '1.2', 'EnergyOS OpenESPI DMD Upload Service', 'MDM Upload (localhost)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, NULL);
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_19_32_33_34_35_36_37_38_41_44_45');
@@ -16,17 +16,18 @@ INSERT INTO application_information_scopes (application_information_id, scope) V
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (1, 'CLIENT_CREDENTIALS');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'AUTHORIZATION_CODE');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'REFRESH_TOKEN');
+INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'CLIENT_CREDENTIALS');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (3, 'CLIENT_CREDENTIALS');
 
 /* Add predefined authorizations */
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/',NULL,'DataCustodian_Admin_Access',NULL,'1','data_custodian_admin',0,1,0,1);
+VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/',NULL,'FB=34_35,FB=45',NULL,'1','data_custodian_admin',0,1,0,1);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,2,0,2);
+VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,2,0,2);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'Upload_Admin_Access',NULL,'1','upload_admin',0,1,0,3);
+VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'FB=45',NULL,'1','upload_admin',0,1,0,3);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,2,0,4);
+VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,2,0,4);
 INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id) 
 VALUES (1,NULL,'2014-05-22 12:15:41',NULL,'self',NULL,'up','2014-05-22 12:15:41','9583C81D-9468-440D-AEF4-27138A5EAC54','0c0c2ee9-c988-43ba-9bef-e798b5049a5a','2014-05-22 12:15:41',1,1,0);
 INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id) 
diff --git a/etc/prepopulatesql_applicationinformation_dc_services_greenbuttondata_org80.sql b/etc/prepopulatesql_applicationinformation_dc_services_greenbuttondata_org80.sql
index ef9c32ef..a1aadda7 100755
--- a/etc/prepopulatesql_applicationinformation_dc_services_greenbuttondata_org80.sql
+++ b/etc/prepopulatesql_applicationinformation_dc_services_greenbuttondata_org80.sql
@@ -1,8 +1,8 @@
 /* Add application_information */ 
 INSERT INTO `application_information` (`id`, `kind`, `description`, `published`, `self_link_href`, `self_link_rel`, `up_link_href`, `up_link_rel`, `updated`, `uuid`, `authorizationServerAuthorizationEndpoint`, `authorizationServerRegistrationEndpoint`, `authorizationServerTokenEndpoint`, `authorizationServerUri`, `clientId`, `clientIdIssuedAt`, `clientName`, `clientSecret`, `clientSecretExpiresAt`, `clientUri`, `contacts`, `dataCustodianApplicationStatus`, `dataCustodianBulkRequestURI`, `dataCustodianDefaultBatchResource`, `dataCustodianDefaultSubscriptionResource`, `dataCustodianId`, `dataCustodianResourceEndpoint`, `dataCustodianThirdPartySelectionScreenURI`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'DATA_CUSTODIAN_ADMIN', 'GreenButtonData.org  Data Custodian Admin Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F5', 'https://services.greenbuttondata.org/DataCustodian/oauth/authorize', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/register', 'https://services.greenbuttondata.org/DataCustodian/oauth/token', 'https://services.greenbuttondata.org/DataCustodian/', 'data_custodian_admin', 1403190000, 'Green Button DataCustodian Admin', 'secret', 0, 'https://services.greenbuttondata.org/DataCustodian','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource', 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/{retailCustomerId}/ThirdPartyList', NULL, NULL, NULL, NULL, NULL, 1, 'EnergyOS OpenESPI', '1.2', 'EnergyOS OpenESPI Example DataCustodian Admin', 'Data Custodian Admin (localhost)', '1', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/ScopeSelection'),
-(2, 'THIRD_PARTY', 'GreenButtonData.org  ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/2', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'https://services.greenbuttondata.org/DataCustodian/oauth/authorize', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/register', 'https://services.greenbuttondata.org/DataCustodian/oauth/token', 'https://services.greenbuttondata.org/DataCustodian/', 'third_party', 1403190000, 'Green Button Third Party', 'secret', 0, 'https://services.greenbuttondata.org/ThirdParty', 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource', 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/1/ThirdPartyList', 'https://services.greenbuttondata.org/ThirdParty/resources/ico/favicon.png', NULL, 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'https://services.greenbuttondata.org/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'https://services.greenbuttondata.org/ThirdParty/login', 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/Notification', NULL, 'https://services.greenbuttondata.org/ThirdParty/RetailCustomer/ScopeSelection', 'https://services.greenbuttondata.org/ThirdParty', 'client_secret_basic', NULL, 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/ScopeSelectionList'),
-(3, 'UPLOAD_ADMIN', 'GreenButtonData.org  MDM Upload Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/3', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F7', 'https://services.greenbuttondata.org/DataCustodian/oauth/authorize', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/register', 'https://services.greenbuttondata.org/DataCustodian/oauth/token', 'https://services.greenbuttondata.org/DataCustodian/', 'upload_admin', 1403190000, 'Green Button DMD Upload Service', 'secret', 0, NULL, 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource', 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/1/ThirdPartyList', NULL, NULL, NULL, NULL, NULL, 1, 'EnergyOS OpenESPI DMD Upload Service', '1.2', 'EnergyOS OpenESPI DMD Upload Service', 'MDM Upload (localhost)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, NULL);
+(1, 'DATA_CUSTODIAN_ADMIN', 'GreenButtonData.org  Data Custodian Admin Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F5', 'https://services.greenbuttondata.org/DataCustodian/oauth/authorize', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/register', 'https://services.greenbuttondata.org/DataCustodian/oauth/token', 'https://services.greenbuttondata.org/DataCustodian/', 'data_custodian_admin', 1403190000, 'Green Button DataCustodian Admin', 'secret', 0, 'https://services.greenbuttondata.org/DataCustodian','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource', 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/{retailCustomerId}/ThirdPartyList', NULL, NULL, NULL, NULL, 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/ApplicationInformation/1', 1, 'EnergyOS OpenESPI', '1.2', 'EnergyOS OpenESPI Example DataCustodian Admin', 'Data Custodian Admin (localhost)', '1', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/ScopeSelection'),
+(2, 'THIRD_PARTY', 'GreenButtonData.org  ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/2', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'https://services.greenbuttondata.org/DataCustodian/oauth/authorize', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/register', 'https://services.greenbuttondata.org/DataCustodian/oauth/token', 'https://services.greenbuttondata.org/DataCustodian/', 'third_party', 1403190000, 'Green Button Third Party', 'secret', 0, 'https://services.greenbuttondata.org/ThirdParty', 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource', 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/1/ThirdPartyList', 'https://services.greenbuttondata.org/ThirdParty/resources/ico/favicon.png', NULL, 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'https://services.greenbuttondata.org/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'https://services.greenbuttondata.org/ThirdParty/login', 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/Notification', NULL, 'https://services.greenbuttondata.org/ThirdParty/RetailCustomer/ScopeSelection', 'https://services.greenbuttondata.org/ThirdParty', 'client_secret_basic', NULL, 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/ScopeSelectionList'),
+(3, 'UPLOAD_ADMIN', 'GreenButtonData.org  MDM Upload Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/3', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F7', 'https://services.greenbuttondata.org/DataCustodian/oauth/authorize', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/register', 'https://services.greenbuttondata.org/DataCustodian/oauth/token', 'https://services.greenbuttondata.org/DataCustodian/', 'upload_admin', 1403190000, 'Green Button DMD Upload Service', 'secret', 0, NULL, 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource', 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/1/ThirdPartyList', NULL, NULL, NULL, NULL, 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/ApplicationInformation/3', 1, 'EnergyOS OpenESPI DMD Upload Service', '1.2', 'EnergyOS OpenESPI DMD Upload Service', 'MDM Upload (localhost)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, NULL);
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_19_32_33_34_35_36_37_38_41_44_45');
@@ -16,17 +16,18 @@ INSERT INTO application_information_scopes (application_information_id, scope) V
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (1, 'CLIENT_CREDENTIALS');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'AUTHORIZATION_CODE');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'REFRESH_TOKEN');
+INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'CLIENT_CREDENTIALS');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (3, 'CLIENT_CREDENTIALS');
 
 /* Add predefined authorizations */
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/',NULL,'DataCustodian_Admin_Access',NULL,'1','data_custodian_admin',0,1,0,1);
+VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/',NULL,'FB=34_35,FB=45',NULL,'1','data_custodian_admin',0,1,0,1);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,2,0,2);
+VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,2,0,2);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'Upload_Admin_Access',NULL,'1','upload_admin',0,1,0,3);
+VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'FB=45',NULL,'1','upload_admin',0,1,0,3);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,2,0,4);
+VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,2,0,4);
 INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id) 
 VALUES (1,NULL,'2014-05-22 12:15:41',NULL,'self',NULL,'up','2014-05-22 12:15:41','9583C81D-9468-440D-AEF4-27138A5EAC54','0c0c2ee9-c988-43ba-9bef-e798b5049a5a','2014-05-22 12:15:41',1,1,0);
 INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id) 
diff --git a/etc/prepopulatesql_applicationinformation_dc_testthirdparty.sql b/etc/prepopulatesql_applicationinformation_dc_testthirdparty.sql
index d3ef34fc..d25a6fe9 100755
--- a/etc/prepopulatesql_applicationinformation_dc_testthirdparty.sql
+++ b/etc/prepopulatesql_applicationinformation_dc_testthirdparty.sql
@@ -1,8 +1,8 @@
 /* Add application_information */ 
 INSERT INTO `application_information` (`id`, `kind`, `description`, `published`, `self_link_href`, `self_link_rel`, `up_link_href`, `up_link_rel`, `updated`, `uuid`, `authorizationServerAuthorizationEndpoint`, `authorizationServerRegistrationEndpoint`, `authorizationServerTokenEndpoint`, `authorizationServerUri`, `clientId`, `clientIdIssuedAt`, `clientName`, `clientSecret`, `clientSecretExpiresAt`, `clientUri`, `contacts`, `dataCustodianApplicationStatus`, `dataCustodianBulkRequestURI`, `dataCustodianDefaultBatchResource`, `dataCustodianDefaultSubscriptionResource`, `dataCustodianId`, `dataCustodianResourceEndpoint`, `dataCustodianThirdPartySelectionScreenURI`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'DATA_CUSTODIAN_ADMIN', 'GreenButtonData.org  Data Custodian Admin Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F5', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'data_custodian_admin', 1403190000, 'Green Button DataCustodian Admin', 'secret', 0, 'http://localhost:8080/DataCustodian','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/{retailCustomerId}/ThirdPartyList', NULL, NULL, NULL, NULL, NULL, 1, 'EnergyOS OpenESPI', '1.2', 'EnergyOS OpenESPI Example DataCustodian Admin', 'Data Custodian Admin (localhost)', '1', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelection'),
-(2, 'THIRD_PARTY', 'GreenButtonData.org  ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/2', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'Green Button Third Party', 'secret', 0, 'http://localhost:8081/ThirdParty', 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8081/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8081/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8081/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8081/ThirdParty/login', 'http://localhost:8081/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8081/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8081/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList?ThirdPartyID=third_party'),
-(3, 'UPLOAD_ADMIN', 'GreenButtonData.org  MDM Upload Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/3', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F7', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'upload_admin', 1403190000, 'Green Button DMD Upload Service', 'secret', 0, NULL, 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', NULL, NULL, NULL, NULL, NULL, 1, 'EnergyOS OpenESPI DMD Upload Service', '1.2', 'EnergyOS OpenESPI DMD Upload Service', 'MDM Upload (localhost)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, NULL);
+(1, 'DATA_CUSTODIAN_ADMIN', 'GreenButtonData.org  Data Custodian Admin Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F5', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'data_custodian_admin', 1403190000, 'Green Button DataCustodian Admin', 'secret', 0, 'http://localhost:8080/DataCustodian','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/{retailCustomerId}/ThirdPartyList', NULL, NULL, NULL, NULL, 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/1', 1, 'EnergyOS OpenESPI', '1.2', 'EnergyOS OpenESPI Example DataCustodian Admin', 'Data Custodian Admin (localhost)', '1', '1', '1', NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelection'),
+(2, 'THIRD_PARTY', 'GreenButtonData.org  ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/2', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'Green Button Third Party', 'secret', 0, 'http://localhost:8081/ThirdParty', 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8081/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8081/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8081/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8081/ThirdParty/login', 'http://localhost:8081/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8081/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8081/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList?ThirdPartyID=third_party'),
+(3, 'UPLOAD_ADMIN', 'GreenButtonData.org  MDM Upload Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/3', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', '185C9C3F-5B4A-44A9-8959-3AE79E60A9F7', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'upload_admin', 1403190000, 'Green Button DMD Upload Service', 'secret', 0, NULL, 'john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', NULL, NULL, NULL, NULL, 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/3', 1, 'EnergyOS OpenESPI DMD Upload Service', '1.2', 'EnergyOS OpenESPI DMD Upload Service', 'MDM Upload (localhost)', NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, 'client_secret_basic', NULL, NULL);
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_19_32_33_34_35_36_37_38_41_44_45');
@@ -16,17 +16,18 @@ INSERT INTO application_information_scopes (application_information_id, scope) V
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (1, 'CLIENT_CREDENTIALS');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'AUTHORIZATION_CODE');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'REFRESH_TOKEN');
+INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (2, 'CLIENT_CREDENTIALS');
 INSERT INTO application_information_grant_types (application_information_id, grantTypes) VALUES (3, 'CLIENT_CREDENTIALS');
 
 /* Add predefined authorizations */
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/',NULL,'DataCustodian_Admin_Access',NULL,'1','data_custodian_admin',0,1,0,1);
+VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','558EBD17-FD1D-435D-8F8D-1D9A129EE1A6','688b026c-665f-4994-9139-6b21b13fbeee','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/1',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/',NULL,'FB=34_35,FB=45',NULL,'1','data_custodian_admin',0,1,0,1);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,2,0,2);
+VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,2,0,2);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'Upload_Admin_Access',NULL,'1','upload_admin',0,1,0,3);
+VALUES (3,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','4229F25A-FEED-4538-B6B9-9793C02515F2','809caf03-612e-4e89-94b1-6f86d83b1ef8','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/3',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/RetailCustomer/{retailCustomerId}/UsagePoint',NULL,'FB=45',NULL,'1','upload_admin',0,1,0,3);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,2,0,4);
+VALUES (4,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,2,0,4);
 INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id) 
 VALUES (1,NULL,'2014-05-22 12:15:41',NULL,'self',NULL,'up','2014-05-22 12:15:41','9583C81D-9468-440D-AEF4-27138A5EAC54','0c0c2ee9-c988-43ba-9bef-e798b5049a5a','2014-05-22 12:15:41',1,1,0);
 INSERT INTO subscriptions (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, hashedId, lastUpdate, applicationInformation_id, authorization_id, retail_customer_id) 
diff --git a/etc/prepopulatesql_applicationinformation_tp.sql b/etc/prepopulatesql_applicationinformation_tp.sql
index 5d60b8b4..07699d8c 100644
--- a/etc/prepopulatesql_applicationinformation_tp.sql
+++ b/etc/prepopulatesql_applicationinformation_tp.sql
@@ -1,6 +1,6 @@
 /* Add application_information */ 
 INSERT INTO `application_information` (`id`, `kind`, `description`, `published`, `self_link_href`, `self_link_rel`, `up_link_href`, `up_link_rel`, `updated`, `uuid`, `authorizationServerAuthorizationEndpoint`, `authorizationServerRegistrationEndpoint`, `authorizationServerTokenEndpoint`, `authorizationServerUri`, `clientId`, `clientIdIssuedAt`, `clientName`, `clientSecret`, `clientSecretExpiresAt`, `clientUri`, `contacts`, `dataCustodianApplicationStatus`, `dataCustodianBulkRequestURI`, `dataCustodianDefaultBatchResource`, `dataCustodianDefaultSubscriptionResource`, `dataCustodianId`, `dataCustodianResourceEndpoint`, `dataCustodianThirdPartySelectionScreenURI`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'THIRD_PARTY', 'EnergyOS OpenESPI ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'http://localhost:8080/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8080/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8080/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8080/ThirdParty/login', 'http://localhost:8080/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8080/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList');
+(1, 'THIRD_PARTY', 'EnergyOS OpenESPI ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'http://localhost:8080/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8080/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8080/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8080/ThirdParty/login', 'http://localhost:8080/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8080/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList');
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13');
@@ -15,6 +15,6 @@ INSERT INTO application_information_grant_types (application_information_id, gra
 
 /* Add authorizations */ 
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,1,0,NULL);
+VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,1,0,NULL);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);
+VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);
diff --git a/etc/prepopulatesql_applicationinformation_tp_localhost443.sql b/etc/prepopulatesql_applicationinformation_tp_localhost443.sql
index e2214b07..b4186eea 100644
--- a/etc/prepopulatesql_applicationinformation_tp_localhost443.sql
+++ b/etc/prepopulatesql_applicationinformation_tp_localhost443.sql
@@ -1,6 +1,6 @@
 /* Add application_information */ 
 INSERT INTO `application_information` (`id`, `kind`, `description`, `published`, `self_link_href`, `self_link_rel`, `up_link_href`, `up_link_rel`, `updated`, `uuid`, `authorizationServerAuthorizationEndpoint`, `authorizationServerRegistrationEndpoint`, `authorizationServerTokenEndpoint`, `authorizationServerUri`, `clientId`, `clientIdIssuedAt`, `clientName`, `clientSecret`, `clientSecretExpiresAt`, `clientUri`, `contacts`, `dataCustodianApplicationStatus`, `dataCustodianBulkRequestURI`, `dataCustodianDefaultBatchResource`, `dataCustodianDefaultSubscriptionResource`, `dataCustodianId`, `dataCustodianResourceEndpoint`, `dataCustodianThirdPartySelectionScreenURI`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'THIRD_PARTY', 'EnergyOS OpenESPI ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'https://localhost/DataCustodian/oauth/authorize', 'https://localhost/DataCustodian/espi/1_1/register', 'https://localhost/DataCustodian/oauth/token', 'https://localhost/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'https://localhost/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://localhost/DataCustodian/espi/1_1/resource/Batch', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://localhost/DataCustodian/espi/1_1/resource', 'https://localhost/DataCustodian/RetailCustomer/1/ThirdPartyList', 'https://localhost/ThirdParty/resources/ico/favicon.png', NULL, 'https://localhost/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'https://localhost/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'https://localhost/ThirdParty/login', 'https://localhost/ThirdParty/espi/1_1/Notification', NULL, 'https://localhost/ThirdParty/RetailCustomer/ScopeSelection', 'https://localhost/ThirdParty', 'client_secret_basic', NULL, 'https://localhost/DataCustodian/RetailCustomer/ScopeSelectionList');
+(1, 'THIRD_PARTY', 'EnergyOS OpenESPI ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'https://localhost/DataCustodian/oauth/authorize', 'https://localhost/DataCustodian/espi/1_1/register', 'https://localhost/DataCustodian/oauth/token', 'https://localhost/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'https://localhost/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://localhost/DataCustodian/espi/1_1/resource/Batch', 'https://localhost/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://localhost/DataCustodian/espi/1_1/resource', 'https://localhost/DataCustodian/RetailCustomer/1/ThirdPartyList', 'https://localhost/ThirdParty/resources/ico/favicon.png', NULL, 'https://localhost/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'https://localhost/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'https://localhost/ThirdParty/login', 'https://localhost/ThirdParty/espi/1_1/Notification', NULL, 'https://localhost/ThirdParty/RetailCustomer/ScopeSelection', 'https://localhost/ThirdParty', 'client_secret_basic', NULL, 'https://localhost/DataCustodian/RetailCustomer/ScopeSelectionList');
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13');
@@ -15,6 +15,6 @@ INSERT INTO application_information_grant_types (application_information_id, gra
 
 /* Add authorizations */ 
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','https://localhost/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,1,0,NULL);
+VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','https://localhost/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,1,0,NULL);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','https://localhost/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);
+VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','https://localhost/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://localhost/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);
diff --git a/etc/prepopulatesql_applicationinformation_tp_localhost8080.sql b/etc/prepopulatesql_applicationinformation_tp_localhost8080.sql
index 5d60b8b4..07699d8c 100755
--- a/etc/prepopulatesql_applicationinformation_tp_localhost8080.sql
+++ b/etc/prepopulatesql_applicationinformation_tp_localhost8080.sql
@@ -1,6 +1,6 @@
 /* Add application_information */ 
 INSERT INTO `application_information` (`id`, `kind`, `description`, `published`, `self_link_href`, `self_link_rel`, `up_link_href`, `up_link_rel`, `updated`, `uuid`, `authorizationServerAuthorizationEndpoint`, `authorizationServerRegistrationEndpoint`, `authorizationServerTokenEndpoint`, `authorizationServerUri`, `clientId`, `clientIdIssuedAt`, `clientName`, `clientSecret`, `clientSecretExpiresAt`, `clientUri`, `contacts`, `dataCustodianApplicationStatus`, `dataCustodianBulkRequestURI`, `dataCustodianDefaultBatchResource`, `dataCustodianDefaultSubscriptionResource`, `dataCustodianId`, `dataCustodianResourceEndpoint`, `dataCustodianThirdPartySelectionScreenURI`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'THIRD_PARTY', 'EnergyOS OpenESPI ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'http://localhost:8080/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8080/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8080/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8080/ThirdParty/login', 'http://localhost:8080/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8080/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList');
+(1, 'THIRD_PARTY', 'EnergyOS OpenESPI ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'http://localhost:8080/DataCustodian/oauth/authorize', 'http://localhost:8080/DataCustodian/espi/1_1/register', 'http://localhost:8080/DataCustodian/oauth/token', 'http://localhost:8080/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'http://localhost:8080/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch', 'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'http://localhost:8080/DataCustodian/espi/1_1/resource', 'http://localhost:8080/DataCustodian/RetailCustomer/1/ThirdPartyList', 'http://localhost:8080/ThirdParty/resources/ico/favicon.png', NULL, 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'http://localhost:8080/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'http://localhost:8080/ThirdParty/login', 'http://localhost:8080/ThirdParty/espi/1_1/Notification', NULL, 'http://localhost:8080/ThirdParty/RetailCustomer/ScopeSelection', 'http://localhost:8080/ThirdParty', 'client_secret_basic', NULL, 'http://localhost:8080/DataCustodian/RetailCustomer/ScopeSelectionList');
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13');
@@ -15,6 +15,6 @@ INSERT INTO application_information_grant_types (application_information_id, gra
 
 /* Add authorizations */ 
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,1,0,NULL);
+VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,1,0,NULL);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);
+VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','http://localhost:8080/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'http://localhost:8080/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);
diff --git a/etc/prepopulatesql_applicationinformation_tp_services_greenbuttondata_org80.sql b/etc/prepopulatesql_applicationinformation_tp_services_greenbuttondata_org80.sql
index 36c720b1..968aed40 100755
--- a/etc/prepopulatesql_applicationinformation_tp_services_greenbuttondata_org80.sql
+++ b/etc/prepopulatesql_applicationinformation_tp_services_greenbuttondata_org80.sql
@@ -1,6 +1,6 @@
 /* Add application_information */ 
 INSERT INTO `application_information` (`id`, `kind`, `description`, `published`, `self_link_href`, `self_link_rel`, `up_link_href`, `up_link_rel`, `updated`, `uuid`, `authorizationServerAuthorizationEndpoint`, `authorizationServerRegistrationEndpoint`, `authorizationServerTokenEndpoint`, `authorizationServerUri`, `clientId`, `clientIdIssuedAt`, `clientName`, `clientSecret`, `clientSecretExpiresAt`, `clientUri`, `contacts`, `dataCustodianApplicationStatus`, `dataCustodianBulkRequestURI`, `dataCustodianDefaultBatchResource`, `dataCustodianDefaultSubscriptionResource`, `dataCustodianId`, `dataCustodianResourceEndpoint`, `dataCustodianThirdPartySelectionScreenURI`, `logoUri`, `policyUri`, `redirectUri`, `registrationAccessToken`, `registrationClientUri`, `responseTypes`, `softwareId`, `softwareVersion`, `thirdPartyApplicationDescription`, `thirdPartyApplicationName`, `thirdPartyApplicationStatus`, `thirdPartyApplicationType`, `thirdPartyApplicationUse`, `thirdPartyDataCustodianSelectionScreenURI`, `thirdPartyLoginScreenURI`, `thirdPartyNotifyUri`, `thirdPartyPhone`, `thirdPartyScopeSelectionScreenURI`, `thirdPartyUserPortalScreenURI`, `tokenEndpointAuthMethod`, `tosUri`, `dataCustodianScopeSelectionScreenURI`) VALUES
-(1, 'THIRD_PARTY', 'EnergyOS OpenESPI ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'https://services.greenbuttondata.org/DataCustodian/oauth/authorize', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/register', 'https://services.greenbuttondata.org/DataCustodian/oauth/token', 'https://services.greenbuttondata.org/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'https://services.greenbuttondata.org/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource', 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/1/ThirdPartyList', 'https://services.greenbuttondata.org/ThirdParty/resources/ico/favicon.png', NULL, 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', NULL, 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'https://services.greenbuttondata.org/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'https://services.greenbuttondata.org/ThirdParty/login', 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/Notification', NULL, 'https://services.greenbuttondata.org/ThirdParty/RetailCustomer/ScopeSelection', 'https://services.greenbuttondata.org/ThirdParty', 'client_secret_basic', NULL, 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/ScopeSelectionList');
+(1, 'THIRD_PARTY', 'EnergyOS OpenESPI ThirdParty Application', '2014-01-02 05:00:00', '/espi/1_1/resource/DataCustodian/ApplicationInformation/1', 'self', '/espi/1_1/resource/DataCustodian/ApplicationInformation', 'up', '2014-01-02 05:00:00', 'AF6E8B03-0299-467E-972A-A883ECDCC575', 'https://services.greenbuttondata.org/DataCustodian/oauth/authorize', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/register', 'https://services.greenbuttondata.org/DataCustodian/oauth/token', 'https://services.greenbuttondata.org/DataCustodian/', 'third_party', 1403190000, 'EnergyOS OpenESPI Third Party', 'secret', 0, 'https://services.greenbuttondata.org/ThirdParty','john.teeter@energyos.org,martin.burns@nist.gov,donald.coffin@reminetworks.com', '1', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Subscription', 'data_custodian', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource', 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/1/ThirdPartyList', 'https://services.greenbuttondata.org/ThirdParty/resources/ico/favicon.png', NULL, 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/OAuthCallBack', 'd89bb056-0f02-4d47-9fd2-ec6a19ba8d0c', 'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/ApplicationInformation/2', 1, 'EnergyOS OpenESPI Example Third Party', '1.2', 'EnergyOS OpenESPI Example Third Party', 'Third Party (localhost)', '1', '1', '1', 'https://services.greenbuttondata.org/ThirdParty/RetailCustomer/{retailCustomerId}/DataCustodianList', 'https://services.greenbuttondata.org/ThirdParty/login', 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/Notification', NULL, 'https://services.greenbuttondata.org/ThirdParty/RetailCustomer/ScopeSelection', 'https://services.greenbuttondata.org/ThirdParty', 'client_secret_basic', NULL, 'https://services.greenbuttondata.org/DataCustodian/RetailCustomer/ScopeSelectionList');
 
 /* Add application_information_scopes */ 
 INSERT INTO application_information_scopes (application_information_id, scope) VALUES (1, 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13');
@@ -15,6 +15,6 @@ INSERT INTO application_information_grant_types (application_information_id, gra
 
 /* Add authorizations */ 
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'ThirdParty_Admin_Access',NULL,'1','third_party_admin',0,1,0,NULL);
+VALUES (1,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','0BA247E0-87F0-41E1-BB50-271468B00DC0','75dd9c46-becf-48b5-9cb5-9c3233d718d0','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/2',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Batch/Bulk',NULL,'FB=34_35',NULL,'1','third_party_admin',0,1,0,NULL);
 INSERT INTO authorizations (id, description, published, self_link_href, self_link_rel, up_link_href, up_link_rel, updated, uuid, access_token, authorization_uri, ap_duration, ap_start, code, error, errorDescription, errorUri, expiresIn, grantType, pp_duration, pp_start, refreshToken, resourceURI, responseType, scope, state, status, third_party, tokenType, application_information_id, retail_customer_id, subscription_id) 
-VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'ThirdParty_Registration_Access',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);
+VALUES (2,NULL,'2014-05-12 09:02:03',NULL,'self',NULL,'up','2014-05-12 09:02:03','2BBCC436-E545-459F-90E9-99113C11FFD4','d89bb056-0f02-4d47-9fd2-ec6a19ba8d0c','https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/Authorization/4',0,0,NULL,NULL,NULL,NULL,31536000,NULL,0,0,NULL,'https://services.greenbuttondata.org/DataCustodian/espi/1_1/resource/ApplicationInformation/2',NULL,'FB=36_40',NULL,'1','REGISTRATION_third_party',0,1,0,NULL);
diff --git a/etc/prepopulatesql_tokenstore_localhost8080.sql b/etc/prepopulatesql_tokenstore_localhost8080.sql
index d1acd6e2..53ac01c8 100644
--- a/etc/prepopulatesql_tokenstore_localhost8080.sql
+++ b/etc/prepopulatesql_tokenstore_localhost8080.sql
@@ -53,7 +53,7 @@ UNLOCK TABLES;
 LOCK TABLES `oauth_client_details` WRITE;
 /*!40000 ALTER TABLE `oauth_client_details` DISABLE KEYS */;
 INSERT INTO `oauth_client_details` VALUES ('data_custodian_admin', NULL, 'secret', 'FB=3_19_32_33_34_35_36_37_38_41_44_45', 'client_credentials', NULL, 'ROLE_DC_ADMIN', '31536000', NULL, NULL, 'FALSE');
-INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token', 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
+INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token,client_credentials', 'http://localhost:8080/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
 INSERT INTO `oauth_client_details` VALUES ('third_party_admin', NULL, 'secret', 'FB=34_35', 'client_credentials', NULL, 'ROLE_TP_ADMIN', '31536000', NULL, NULL, 'FALSE');
 INSERT INTO `oauth_client_details` VALUES ('upload_admin', NULL, 'secret', 'FB=45', 'client_credentials', NULL, 'ROLE_UL_ADMIN', '31536000', NULL, NULL, 'FALSE');
 INSERT INTO `oauth_client_details` VALUES ('REGISTRATION_third_party', NULL, 'secret', 'FB=36_40', 'client_credentials', NULL, 'ROLE_TP_REGISTRATION', '31536000', NULL, NULL, 'FALSE');
diff --git a/etc/prepopulatesql_tokenstore_services_greenbuttondata_org80.sql b/etc/prepopulatesql_tokenstore_services_greenbuttondata_org80.sql
index 5d16590e..c6be6285 100644
--- a/etc/prepopulatesql_tokenstore_services_greenbuttondata_org80.sql
+++ b/etc/prepopulatesql_tokenstore_services_greenbuttondata_org80.sql
@@ -50,7 +50,7 @@ UNLOCK TABLES;
 LOCK TABLES `oauth_client_details` WRITE;
 /*!40000 ALTER TABLE `oauth_client_details` DISABLE KEYS */;
 INSERT INTO `oauth_client_details` VALUES ('data_custodian_admin', NULL, 'secret', 'FB=3_19_32_33_34_35_36_37_38_41_44_45', 'client_credentials', NULL, 'ROLE_DC_ADMIN', '31536000', NULL, NULL, 'FALSE');
-INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token', 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
+INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token,client_credentials', 'https://services.greenbuttondata.org/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
 INSERT INTO `oauth_client_details` VALUES ('third_party_admin', NULL, 'secret', 'FB=34_35', 'client_credentials', NULL, 'ROLE_TP_ADMIN', '31536000', NULL, NULL, 'FALSE');
 INSERT INTO `oauth_client_details` VALUES ('upload_admin', NULL, 'secret', 'FB=45', 'client_credentials', NULL, 'ROLE_UL_ADMIN', '31536000', NULL, NULL, 'FALSE');
 INSERT INTO `oauth_client_details` VALUES ('REGISTRATION_third_party', NULL, 'secret', 'FB=36_40', 'client_credentials', NULL, 'ROLE_TP_REGISTRATION', '31536000', NULL, NULL, 'FALSE');
diff --git a/etc/prepopulatesql_tokenstore_testthirdparty.sql b/etc/prepopulatesql_tokenstore_testthirdparty.sql
index 1c521ecc..7a6adec6 100644
--- a/etc/prepopulatesql_tokenstore_testthirdparty.sql
+++ b/etc/prepopulatesql_tokenstore_testthirdparty.sql
@@ -53,7 +53,7 @@ UNLOCK TABLES;
 LOCK TABLES `oauth_client_details` WRITE;
 /*!40000 ALTER TABLE `oauth_client_details` DISABLE KEYS */;
 INSERT INTO `oauth_client_details` VALUES ('data_custodian_admin', NULL, 'secret', 'FB=3_19_32_33_34_35_36_37_38_41_44_45', 'client_credentials', NULL, 'ROLE_DC_ADMIN', '31536000', NULL, NULL, 'FALSE');
-INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token', 'http://localhost:8081/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '31536000', '157680000', NULL, 'FALSE');
+INSERT INTO `oauth_client_details` VALUES ('third_party', NULL, 'secret', 'FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_15_39;IntervalDuration=900;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_13_14_39;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13,FB=1_3_4_5_6_7_8_9_10_11_29_12_13_14_15_16_17_18_19_27_28_32_33_34_35_37_38_39_40_41_44;IntervalDuration=3600;BlockDuration=monthly;HistoryLength=13', 'authorization_code,refresh_token,client_credentials', 'http://localhost:8081/ThirdParty/espi/1_1/OAuthCallBack', 'ROLE_USER', '120', '157680000', NULL, 'FALSE');
 INSERT INTO `oauth_client_details` VALUES ('third_party_admin', NULL, 'secret', 'FB=34_35', 'client_credentials', NULL, 'ROLE_TP_ADMIN', '31536000', NULL, NULL, 'FALSE');
 INSERT INTO `oauth_client_details` VALUES ('upload_admin', NULL, 'secret', 'FB=45', 'client_credentials', NULL, 'ROLE_UL_ADMIN', '31536000', NULL, NULL, 'FALSE');
 INSERT INTO `oauth_client_details` VALUES ('REGISTRATION_third_party', NULL, 'secret', 'FB=36_40', 'client_credentials', NULL, 'ROLE_TP_REGISTRATION', '31536000', NULL, NULL, 'FALSE');