diff --git a/source/core/Script.cpp b/source/core/Script.cpp
index 4604b3878..63dff2eda 100644
--- a/source/core/Script.cpp
+++ b/source/core/Script.cpp
@@ -2758,7 +2758,7 @@ void __fastcall TManagementScript::Connect(const UnicodeString Session,
         TScriptCommands::CheckParams(Options, false);
       }
 
-      if (!Session.IsEmpty() && !Data->Name.IsEmpty() && (Batch != TScript::BatchOff) && !Interactive)
+      if (!Session.IsEmpty() && (Data->Source != ::ssNone) && (Batch != TScript::BatchOff) && !Interactive)
       {
         std::unique_ptr<TSessionData> DataWithFingerprint(Data->Clone());
         DataWithFingerprint->LookupLastFingerprint();
diff --git a/source/core/SessionData.cpp b/source/core/SessionData.cpp
index 33ae8107b..a430c9a66 100644
--- a/source/core/SessionData.cpp
+++ b/source/core/SessionData.cpp
@@ -1944,7 +1944,7 @@ void __fastcall TSessionData::Modify()
   }
 }
 //---------------------------------------------------------------------
-UnicodeString __fastcall TSessionData::GetSource()
+UnicodeString __fastcall TSessionData::GetSourceName()
 {
   switch (FSource)
   {
diff --git a/source/core/SessionData.h b/source/core/SessionData.h
index e84ad8440..f8cec0424 100644
--- a/source/core/SessionData.h
+++ b/source/core/SessionData.h
@@ -451,7 +451,7 @@ friend class TStoredSessionList;
   UnicodeString __fastcall GetLocalName();
   UnicodeString __fastcall GetFolderName();
   void __fastcall Modify();
-  UnicodeString __fastcall GetSource();
+  UnicodeString __fastcall GetSourceName();
   void __fastcall DoLoad(THierarchicalStorage * Storage, bool PuttyImport, bool & RewritePassword, bool Unsafe, bool RespectDisablePasswordStoring);
   void __fastcall DoSave(THierarchicalStorage * Storage,
     bool PuttyExport, const TSessionData * Default, bool DoNotEncryptPasswords);
@@ -739,7 +739,8 @@ friend class TStoredSessionList;
   __property int OrigPortNumber = { read = FOrigPortNumber };
   __property UnicodeString LocalName = { read = GetLocalName };
   __property UnicodeString FolderName = { read = GetFolderName };
-  __property UnicodeString Source = { read = GetSource };
+  __property TSessionSource Source = { read = FSource };
+  __property UnicodeString SourceName = { read = GetSourceName };
   __property bool SaveOnly = { read = FSaveOnly };
 };
 //---------------------------------------------------------------------------
diff --git a/source/core/SessionInfo.cpp b/source/core/SessionInfo.cpp
index 29ac527cb..588c8d871 100644
--- a/source/core/SessionInfo.cpp
+++ b/source/core/SessionInfo.cpp
@@ -1231,7 +1231,7 @@ void __fastcall TSessionLog::DoAddStartupInfo(TSessionData * Data)
   }
   else
   {
-    ADF(L"Session name: %s (%s)", (Data->SessionName, Data->Source));
+    ADF(L"Session name: %s (%s)", (Data->SessionName, Data->SourceName));
     UnicodeString AddressFamily;
     if (Data->AddressFamily != afAuto)
     {