diff --git a/components/sessionsprivate/sessionsmodel.cpp b/components/sessionsprivate/sessionsmodel.cpp
--- a/components/sessionsprivate/sessionsmodel.cpp
+++ b/components/sessionsprivate/sessionsmodel.cpp
@@ -251,7 +251,7 @@
     if (index.row() == m_data.count()) {
         switch (static_cast<Role>(role)) {
         case Role::RealName: return i18n("New Session");
-        case Role::IconName: return QStringLiteral("list-add");
+        case Role::IconName: return QStringLiteral("system-switch-user");
         case Role::Name: return i18n("New Session");
         case Role::DisplayNumber: return 0; //NA
         case Role::VtNumber: return -1; //an invalid VtNumber - which we'll use to indicate it's to start a new session
diff --git a/lookandfeel/contents/lockscreen/LockScreenUi.qml b/lookandfeel/contents/lockscreen/LockScreenUi.qml
--- a/lookandfeel/contents/lockscreen/LockScreenUi.qml
+++ b/lookandfeel/contents/lockscreen/LockScreenUi.qml
@@ -57,7 +57,7 @@
 
     SessionsModel {
         id: sessionsModel
-        showNewSessionEntry: true
+        showNewSessionEntry: false
     }
 
     PlasmaCore.DataSource {
@@ -264,9 +264,17 @@
 
             Component.onCompleted: {
                 if (defaultToSwitchUser) { //context property
-                    mainStack.push({
-                        item: switchSessionPage,
-                        immediate: true});
+                    // If we are in the only session, then going to the session switcher is
+                    // a pointless extra step; instead create a new session immediately
+                    if (((sessionsModel.showNewSessionEntry && sessionsModel.count === 1)  ||
+                       (!sessionsModel.showNewSessionEntry && sessionsModel.count === 0)) &&
+                       sessionsModel.canStartNewSession) {
+                        sessionsModel.startNewSession(true /* lock the screen too */)
+                    } else {
+                        mainStack.push({
+                            item: switchSessionPage,
+                            immediate: true});
+                    }
                 }
             }
         }
@@ -414,14 +422,31 @@
                 Keys.onReturnPressed: initSwitchSession()
                 Keys.onEscapePressed: mainStack.pop()
 
-                PlasmaComponents.Button {
+                ColumnLayout {
                     Layout.fillWidth: true
-                    font.pointSize: theme.defaultFont.pointSize + 1
-                    // the magic "-1" vtNumber indicates the "New Session" entry
-                    text: userListCurrentModelData.vtNumber === -1 ? i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Start New Session") : i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Switch Session")
-                    onClicked: initSwitchSession()
+                    spacing: units.largeSpacing
+
+                    PlasmaComponents.Button {
+                        Layout.fillWidth: true
+                        font.pointSize: theme.defaultFont.pointSize + 1
+                        text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Switch to this Session")
+                        onClicked: initSwitchSession()
+                        visible: sessionsModel.count > 0
+                    }
+
+                    PlasmaComponents.Button {
+                        Layout.fillWidth: true
+                        font.pointSize: theme.defaultFont.pointSize + 1
+                        text: i18nd("plasma_lookandfeel_org.kde.lookandfeel", "Start New Session")
+                        onClicked: {
+                            mainStack.pop({immediate:true})
+                            sessionsModel.startNewSession(true /* lock the screen too */)
+                            lockScreenRoot.state = ''
+                        }
+                    }
                 }
 
+
                 actionItems: [
                     ActionButton {
                         iconSource: "go-previous"