diff --git a/Properties/launchSettings.json b/Properties/launchSettings.json
index 4afabc6..e94cf0a 100644
--- a/Properties/launchSettings.json
+++ b/Properties/launchSettings.json
@@ -16,7 +16,7 @@
     "IIS Express": {
       "commandName": "IISExpress",
       "launchBrowser": true,
-      "launchUrl": "api/v1/LookupCode/ConcessionTypes",
+      "launchUrl": "swagger",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
diff --git a/Repository/AdminUserRepository.cs b/Repository/AdminUserRepository.cs
index 1c88c06..10d313f 100644
--- a/Repository/AdminUserRepository.cs
+++ b/Repository/AdminUserRepository.cs
@@ -71,7 +71,8 @@ namespace CarParkValidationAPI.Repository
 
 		private AdminUser FillAdminUser(AdminUserDto dto, AdminUser model)
 		{
-			model.UserID = dto.Id;
+			if (dto.Id > 0)
+				model.UserID = dto.Id;
 			model.Name = dto.Name;
 			model.RoleType = dto.RoleType;
 			model.StafflinkNo = dto.StafflinkNo;
diff --git a/Repository/ConcessionTypeRepository.cs b/Repository/ConcessionTypeRepository.cs
index 635ec5f..3bab604 100644
--- a/Repository/ConcessionTypeRepository.cs
+++ b/Repository/ConcessionTypeRepository.cs
@@ -50,7 +50,8 @@ namespace CarParkValidationAPI.Repository
 		    model.ConcessionDesc = dto.Description.Trim();
 			if (!string.IsNullOrEmpty(dto.Display))
 				model.ConcessionDisplay = dto.Display.Trim();
-			model.ConcessionTypeID = dto.Id;
+			if (dto.Id > 0)
+				model.ConcessionTypeID = dto.Id;
 			return model;
 		}
 		public async Task<ResultModel<List<ConcessionTypeDto>>> LoadConcessionTypeAsync(bool onlyActive)
diff --git a/Repository/ConcessionValidationRepository.cs b/Repository/ConcessionValidationRepository.cs
index 9fda313..2e68da6 100644
--- a/Repository/ConcessionValidationRepository.cs
+++ b/Repository/ConcessionValidationRepository.cs
@@ -75,7 +75,8 @@ namespace CarParkValidationAPI.Repository
 			model.ConcessionExpiry = dto.ConcessionExpiry;
 			model.ConcessionHolder = dto.ConcessionHolder.Trim();
 			model.ConcessionTypeID = dto.ConcessionTypeId;
-			model.ValidationID = dto.Id;
+			if (dto.Id > 0)
+				model.ValidationID = dto.Id;
 			model.StafflinkNo = dto.StafflinkNo;
 			model.StaffFirstName = dto.StaffFirstName.Trim();
 			model.StaffLastName = dto.StaffLastName.Trim();
diff --git a/Repository/ValidationPointRepository.cs b/Repository/ValidationPointRepository.cs
index c1e5d2f..e353766 100644
--- a/Repository/ValidationPointRepository.cs
+++ b/Repository/ValidationPointRepository.cs
@@ -47,7 +47,8 @@ namespace CarParkValidationAPI.Repository
 			model.Description = item.Description.Trim();
 			if (!string.IsNullOrEmpty(item.Display))
 				model.DisplayName = item.Display.Trim();
-			model.ValidationPointID = item.Id;
+			if (item.Id > 0)
+				model.ValidationPointID = item.Id;
 			return model;
 		}
 
diff --git a/appsettings.Development.json b/appsettings.Development.json
index eb4634b..eca23db 100644
--- a/appsettings.Development.json
+++ b/appsettings.Development.json
@@ -1,13 +1,5 @@
 {
-  "AppSettings": {
-    "Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.",
-    "SQLConnectionString": "Server=NEPHICT-040931L;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
-    "LDAPPath": "",
-    "LDAPUser": "S",
-    "LDAPPassword": "",
-    "ADTimeOut": "30",
-    "LoginWebAPI": "http://NEPHMDB-SQL007/CommonWebApiAD/api/AD"
-  },
+ 
   "Logging": {
     "LogLevel": {
       "Default": "Information",
diff --git a/appsettings.json b/appsettings.json
index a4143fe..64015e0 100644
--- a/appsettings.json
+++ b/appsettings.json
@@ -1,7 +1,7 @@
 {
   "AppSettings": {
     "Secret": "Nepean Blue Mountain Super Secret SIGN AND VERIFY JWT TOKENS, BEARER TOKEN USE WHEN CALLING THIS API.",
-    "SQLConnectionString": "Server=NEPHICT-040931L;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
+    "SQLConnectionString": "Server=NEPHMDB-SQL007;Initial Catalog=CarParkValidation;Persist Security Info=False;User ID=bids_admin;Password=Password4BI;MultipleActiveResultSets=False;Encrypt=True;TrustServerCertificate=True;Connection Timeout=30;",
     "LDAPPath": "",
     "LDAPUser": "S",
     "LDAPPassword": "",