diff --git a/src/Lib/client.cpp b/src/Lib/client.cpp
index 95045b3..bd6d109 100755
--- a/src/Lib/client.cpp
+++ b/src/Lib/client.cpp
@@ -274,11 +274,7 @@ void lc::Client::StartZLeaf( const QString * argFakeName, QString cmd ) {
            == messageBoxRunningZLeafFound->button( QMessageBox::Yes ) )
          || state != state_t::ZLEAF_RUNNING ) {
         QStringList arguments;
-        if ( argFakeName  == nullptr && GetSessionPort() == 7000 ) {
-            arguments << "-i" << settings->pkeyPathUser
-                      << QString{ settings->userNameOnClients + "@" + ip }
-                      << cmd;
-        } else if ( argFakeName  == nullptr ) {
+        if ( argFakeName  == nullptr ) {
             arguments << "-i" << settings->pkeyPathUser
                       << QString{ settings->userNameOnClients + "@" + ip }
                       << cmd;
diff --git a/src/Lib/lablib.cpp b/src/Lib/lablib.cpp
index aef9889..78fa67a 100755
--- a/src/Lib/lablib.cpp
+++ b/src/Lib/lablib.cpp
@@ -182,5 +182,6 @@ QStringList lc::Lablib::getzLeafArgs( int sessionPort, QString zleafVersion ){
                   << QString::number( sessionPort- 7000 );
     }
 
+    //Return the crafted QStringList
     return arguments;
 }
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 83df214..2b992d4 100755
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -638,13 +638,12 @@ void lc::MainWindow::on_PBViewDesktopFullControl_clicked()
 
 
 /* Session tab functions */
-
 void lc::MainWindow::on_PBStartzLeaf_clicked() {
     QModelIndexList activated_items = ui->TVClients->selectionModel()->selectedIndexes();
     for ( QModelIndexList::ConstIterator it = activated_items.cbegin(); it != activated_items.cend(); ++it ) {
         if ( ( *it ).data( Qt::DisplayRole ).type() != 0 ) {
             Client *client = static_cast< Client* >( ( *it ).data( Qt::UserRole ).value< void * >() );
-            client->StartZLeaf( nullptr );
+            client->StartZLeaf( nullptr, ui->LEzLeafCommandline->text() );
         }
     }
 }
@@ -807,7 +806,7 @@ void lc::MainWindow::on_PBStartSession_clicked() {
         }
     }
 
-    //Set chosen Port
+    // Set chosen Port
     settings->SetChosenZTreePort(ui->SBPort->text().toInt());
     // Increment port number
     int newPort = ui->SBPort->text().toInt() + 1;
diff --git a/src/mainwindow.ui b/src/mainwindow.ui
index da11085..20bcaf1 100755
--- a/src/mainwindow.ui
+++ b/src/mainwindow.ui
@@ -64,7 +64,7 @@
        </font>
       </property>
       <property name="currentIndex">
-       <number>0</number>
+       <number>1</number>
       </property>
       <property name="usesScrollButtons">
        <bool>true</bool>