diff --git a/Borepin/Borepin/App.xaml.cs b/Borepin/Borepin/App.xaml.cs
index e8c4d4c..8db5e7b 100644
--- a/Borepin/Borepin/App.xaml.cs
+++ b/Borepin/Borepin/App.xaml.cs
@@ -70,68 +70,70 @@ namespace Borepin
                     IAPI api = apiService.GetAPI();
 
                     // TODO Preferred Account
-                    if (!api.IsConnected)
-                    {
-                        ILoginStorageService loginStorageService = Container.Resolve<ILoginStorageService>();
-                        List<ConnectionData> list = (List<ConnectionData>)await loginStorageService.GetList().ConfigureAwait(false);
+                    //if (!api.IsConnected)
+                    //{
+                    //    ILoginStorageService loginStorageService = Container.Resolve<ILoginStorageService>();
+                    //    List<ConnectionData> list = (List<ConnectionData>)await loginStorageService.GetList().ConfigureAwait(false);
 
-                        ConnectionData connectionData = list.Find(x => string.Equals(x.Host.Host, uri.Host, StringComparison.OrdinalIgnoreCase));
+                    //    ConnectionData connectionData = list.Find(x => string.Equals(x.Host.Host, uri.Host, StringComparison.OrdinalIgnoreCase));
                         
-                        if(connectionData == null)
-                        {
-                            Device.BeginInvokeOnMainThread(async () =>
-                            {
-                                await pageDialogService.DisplayAlertAsync("NFC connect failed", "No ConnectionData", "Ok").ConfigureAwait(false);
-                            });
+                    //    if(connectionData == null)
+                    //    {
+                    //        Device.BeginInvokeOnMainThread(async () =>
+                    //        {
+                    //            await pageDialogService.DisplayAlertAsync("NFC connect failed", "No ConnectionData", "Ok").ConfigureAwait(false);
+                    //        });
 
-                            return;
-                        }
+                    //        return;
+                    //    }
 
-                        try
-                        {
-                            await api.Connect(connectionData).ConfigureAwait(false);
-                        }
-                        catch (Exception ex)
-                        {
-                            // TODO
-                            Device.BeginInvokeOnMainThread(async () =>
-                            {
-                                await pageDialogService.DisplayAlertAsync("NFC connect failed", ex.ToString(), "Ok").ConfigureAwait(false);
-                            });
+                    //    try
+                    //    {
+                    //        await api.Connect(connectionData).ConfigureAwait(false);
+                    //    }
+                    //    catch (Exception ex)
+                    //    {
+                    //        // TODO
+                    //        Device.BeginInvokeOnMainThread(async () =>
+                    //        {
+                    //            await pageDialogService.DisplayAlertAsync("NFC connect failed", ex.ToString(), "Ok").ConfigureAwait(false);
+                    //        });
                             
-                            return;
-                        }
-                    }
+                    //        return;
+                    //    }
+                    //}
 
                     if (api.IsConnected)
                     {
-                        if (string.Equals(uri.Host, api.ConnectionData.Host.Host, StringComparison.OrdinalIgnoreCase))
+                        Optional < Machine> optional = await api.Session.MachineSystem.Info.GetMachine(resource_id).ConfigureAwait(false);
+
+                        if (optional.Just == null)
                         {
-                            Optional<Machine> optional = await api.Session.MachineSystem.Info.GetMachine(resource_id).ConfigureAwait(false);
-
-                            if (optional.Just == null)
-                            {
-                                return;
-                            }
-
-                            Prism.Navigation.NavigationParameters parameters = new Prism.Navigation.NavigationParameters
-                            {
-                                { "instance", optional.Just.Id },
-                            };
-
                             Device.BeginInvokeOnMainThread(async () =>
                             {
-                                INavigationResult result = await Container.Resolve<INavigationService>().NavigateAsync("/MainPage/NavigationPage/MachineListPage/MachinePage", parameters).ConfigureAwait(false);
+                                await pageDialogService.DisplayAlertAsync("NFC Error", "Unknown ID" + resource_id, "Ok").ConfigureAwait(false);
                             });
-                         }
+                            return;
+                        }
+                            
+                        Prism.Navigation.NavigationParameters parameters = new Prism.Navigation.NavigationParameters
+                        {
+                            { "instance", optional.Just.Id },
+                        };
+
+                        Device.BeginInvokeOnMainThread(async () =>
+                        {
+                            INavigationResult result = await Container.Resolve<INavigationService>().NavigateAsync("/MainPage/NavigationPage/MachineListPage/MachinePage", parameters).ConfigureAwait(false);
+                        });
                     }
                 }
                 else
                 {
-                    Device.BeginInvokeOnMainThread(async () =>
-                    {
-                        await pageDialogService.DisplayAlertAsync("Intent", "No Services", "Ok").ConfigureAwait(false);
-                    });
+                    return;
+                    //Device.BeginInvokeOnMainThread(async () =>
+                    //{
+                    //    INavigationResult result =  await NavigationService.NavigateAsync(new Uri("https://borepin.fab-access.org/StartPage")).ConfigureAwait(false);
+                    //});
                 }
             }
 
diff --git a/FabAccessAPI/schema b/FabAccessAPI/schema
index 19f20f5..cde4677 160000
--- a/FabAccessAPI/schema
+++ b/FabAccessAPI/schema
@@ -1 +1 @@
-Subproject commit 19f20f5154f0eced6288ff56cac840025ee51da1
+Subproject commit cde4677575f8e133ac764663e131c80fc891d545