diff --git a/Pilz.Configuration/Pilz.Configuration.vbproj b/Pilz.Configuration/Pilz.Configuration.vbproj
index 6b3ee58..bb9eb2c 100644
--- a/Pilz.Configuration/Pilz.Configuration.vbproj
+++ b/Pilz.Configuration/Pilz.Configuration.vbproj
@@ -25,7 +25,7 @@
   </PropertyGroup>
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>3.0.5</Version>
+    <Version>3.0.</Version>
   </PropertyGroup>
   <ItemGroup>
     <PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" />
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs b/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs
index 335a302..bcff514 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/Client/LoginFlowV2/OcsApiLoginFlowV2.cs
@@ -18,7 +18,7 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2
 
         public OcsResponseLoginFlowV2? Init(string url)
         {
-            return Manager.MakeRequest<OcsResponseLoginFlowV2>(HttpMethod.Get, url + OCS_LOGIN_INIT);
+            return Manager.MakeRequest<OcsResponseLoginFlowV2>(HttpMethod.Post, url + OCS_LOGIN_INIT);
         }
 
         public OcsResponseLoginFlowV2Credentials? Poll(OcsResponseLoginFlowV2.PollData poll)
@@ -26,7 +26,7 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Client.LoginFlowV2
             ArgumentNullException.ThrowIfNull(poll?.Endpoint);
             ArgumentNullException.ThrowIfNull(poll?.Token);
 
-            return Manager.MakeRequest<OcsResponseLoginFlowV2Credentials?>(HttpMethod.Get, poll.Endpoint,
+            return Manager.MakeRequest<OcsResponseLoginFlowV2Credentials?>(HttpMethod.Post, poll.Endpoint,
                 parameters: new Dictionary<string, string>
                 {
                     { "token", poll.Token }
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs
index 102bcbc..406aef2 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs
+++ b/Pilz.Networking.CloudProviders.Nextcloud/OCS/OcsApi.cs
@@ -120,8 +120,13 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
 
             if (responseInit != null)
             {
-                var bodyInit = responseInit.Content.ReadAsStringAsync().Result;
-                return JsonConvert.DeserializeObject<TResponse>(bodyInit);
+                try
+                {
+                    var bodyInit = responseInit.Content.ReadAsStringAsync().Result;
+                    return JsonConvert.DeserializeObject<TResponse>(bodyInit);
+                }
+                catch(FormatException) { }
+                catch(JsonSerializationException) { }
             }
 
             return default;
@@ -192,11 +197,15 @@ namespace Pilz.Networking.CloudProviders.Nextcloud.Ocs
                 {
                     { "Accept", CONTENT_TYPE_JSON },
                     { "OCS-APIREQUEST", "true" },
-                    { "Authorization", authentication.ToBasicAuth() }
+                    //{ "Authorization", authentication.ToBasicAuth() }
                 },
                 Content = httpContent
             };
 
+            // Add authorization
+            if (authentication != null)
+                request.Headers.Add("Authorization", authentication.ToBasicAuth());
+
             return client.Send(request);
         }
 
diff --git a/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj b/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj
index f86465d..3322f00 100644
--- a/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj
+++ b/Pilz.Networking.CloudProviders.Nextcloud/Pilz.Networking.CloudProviders.Nextcloud.csproj
@@ -8,7 +8,7 @@
 
   <PropertyGroup>
     <GeneratePackageOnBuild>True</GeneratePackageOnBuild>
-    <Version>2.1.0</Version>
+    <Version>2.1.1</Version>
   </PropertyGroup>
 
   <ItemGroup>