diff --git a/ENI-2/ENI2/ENI2/App.config b/ENI-2/ENI2/ENI2/App.config
index 0bcaf9cc..fbb9572e 100644
--- a/ENI-2/ENI2/ENI2/App.config
+++ b/ENI-2/ENI2/ENI2/App.config
@@ -26,12 +26,12 @@
                 <value>1000</value>
             </setting>
             <setting name="LockingServerAddress" serializeAs="String">
-              <value>http://192.168.2.24/LockingService/LockingService.svc</value>
-                <!--value>http://heupferd/bsmd.LockingService/LockingService.svc</value-->
+              <!--value>http://192.168.2.24/LockingService/LockingService.svc</value-->
+                <value>http://heupferd/bsmd.LockingService/LockingService.svc</value>
             </setting>
             <setting name="ConnectionString" serializeAs="String">
-              <value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value>
-              <!--value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value-->
+              <!--value>Initial Catalog=nsw;Data Source=192.168.2.24\SQLEXPRESS;Uid=dfuser;pwd=dfpasswd;Persist Security Info=False;Connection Reset=false</value-->
+              <value>Data Source=(localdb)\MSSQLLocalDB;Initial Catalog=E:\DATA\DB\NSW.MDF;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=False;ApplicationIntent=ReadWrite;MultiSubnetFailover=False</value>
             </setting>
         </ENI2.Properties.Settings>
     </applicationSettings>
diff --git a/ENI-2/ENI2/ENI2/ENI2.csproj b/ENI-2/ENI2/ENI2/ENI2.csproj
index 55a0460a..890a7a16 100644
--- a/ENI-2/ENI2/ENI2/ENI2.csproj
+++ b/ENI-2/ENI2/ENI2/ENI2.csproj
@@ -84,13 +84,13 @@
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestCertificateThumbprint>E2879001C2E0FD9E6735E0585D11C8355DBEF3EA</ManifestCertificateThumbprint>
+    <ManifestCertificateThumbprint>DBA67DB331E10F18BBF1E67B125EC87AB5389EA4</ManifestCertificateThumbprint>
   </PropertyGroup>
   <PropertyGroup>
     <SignManifests>true</SignManifests>
   </PropertyGroup>
   <PropertyGroup>
-    <ManifestKeyFile>ENI2_2_TemporaryKey.pfx</ManifestKeyFile>
+    <ManifestKeyFile>ENI2_3_TemporaryKey.pfx</ManifestKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="ExcelDataReader, Version=3.6.0.0, Culture=neutral, PublicKeyToken=93517dbe6a4012fa, processorArchitecture=MSIL">
@@ -624,6 +624,7 @@
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
     <None Include="ENI2_2_TemporaryKey.pfx" />
+    <None Include="ENI2_3_TemporaryKey.pfx" />
     <None Include="Service References\LockingServiceReference\ENI2.LockingServiceReference.CoreLock.datasource">
       <DependentUpon>Reference.svcmap</DependentUpon>
     </None>
diff --git a/ENI-2/ENI2/ENI2/ENI2_3_TemporaryKey.pfx b/ENI-2/ENI2/ENI2/ENI2_3_TemporaryKey.pfx
new file mode 100644
index 00000000..b7f1e184
Binary files /dev/null and b/ENI-2/ENI2/ENI2/ENI2_3_TemporaryKey.pfx differ
diff --git a/Stundensheet.xlsx b/Stundensheet.xlsx
index 07c7e974..d28caf21 100644
Binary files a/Stundensheet.xlsx and b/Stundensheet.xlsx differ
diff --git a/nsw/Source/bsmd.ExcelReadService/Util.cs b/nsw/Source/bsmd.ExcelReadService/Util.cs
index a8042dec..5ad44df1 100644
--- a/nsw/Source/bsmd.ExcelReadService/Util.cs
+++ b/nsw/Source/bsmd.ExcelReadService/Util.cs
@@ -685,7 +685,9 @@ namespace bsmd.ExcelReadService
                 }
                 reader.Conf.ConfirmText(marpol_flash, marpolPosition.Flashpoint_CEL, aReadState);
 
-                if (marpolPosition.Flashpoint_CEL.IsNullOrEmpty()) { marpolPosition.FlashpointInformation = 0; } // NF // Ableitung Flashpoint-Info: Christin, 22.3.2017
+                // Früher bei NULL: NF // Ableitung Flashpoint-Info: Christin, 22.3.2017
+                // jetzt bei leerer Flashpoint_CEL: Flashpointinformation NULL: Basti, 13.7.2020
+                if (marpolPosition.Flashpoint_CEL.IsNullOrEmpty()) { marpolPosition.FlashpointInformation = null; }
                 else
                 {
                     if (double.TryParse(marpolPosition.Flashpoint_CEL, out double flashval))
diff --git a/nsw/Source/misc/db.sqlite b/nsw/Source/misc/db.sqlite
index 8fffebab..5dea2441 100644
Binary files a/nsw/Source/misc/db.sqlite and b/nsw/Source/misc/db.sqlite differ