diff --git a/3rdparty/3rdparty.pri b/3rdparty/3rdparty.pri
index 9e829e829..c7263b9bb 100644
--- a/3rdparty/3rdparty.pri
+++ b/3rdparty/3rdparty.pri
@@ -7,7 +7,18 @@
 OTHER_FILES += $$PWD/../src/resources/qml/3rdparty/php-unserialize-js/phpUnserialize.js
 
 # qredisclient
-include($$PWD/qredisclient/qredisclient.pri)
+if(win32*):exists( $$PWD/qredisclient/qredisclient.lib ) {
+    message("Using prebuilt qredisclient")    
+    INCLUDEPATH += $$PWD/qredisclient/src/    
+    OPENSSL_LIB_PATH = C:\OpenSSL-Win32\lib\VC\static   
+    LIBS += -L$$OPENSSL_LIB_PATH -llibeay32MD -L$$PWD/qredisclient/ -lqredisclient -lbotan -llibssh2
+} else:unix*:exists( $$PWD/qredisclient/libqredisclient.a ) {
+    message("Using prebuilt qredisclient")
+    INCLUDEPATH += $$PWD/qredisclient/src/
+    LIBS += $$PWD/qredisclient/libqredisclient.a
+} else {
+    include($$PWD/qredisclient/qredisclient.pri)
+}
 
 # Asyncfuture
 include($$PWD/asyncfuture/asyncfuture.pri)
diff --git a/src/qml/ConnectionSettignsDialog.qml b/src/qml/ConnectionSettignsDialog.qml
index a4c803680..b7fc1257e 100644
--- a/src/qml/ConnectionSettignsDialog.qml
+++ b/src/qml/ConnectionSettignsDialog.qml
@@ -138,19 +138,26 @@ Dialog {
 
                 Tab {
                     id: mainTab
+                    anchors.fill: parent
+                    anchors.margins: 10
                     title: qsTranslate("RDM","Connection Settings")
 
                     ScrollView {
-                        ColumnLayout {
-                            anchors.left: parent.left
-                            anchors.right: parent.right
-                            anchors.margins: PlatformUtils.isOSX()? 5 : 10
+                        id: mainSettingsScrollView
+                        width: settingsTabs.width - 20
+                        height: settingsTabs.height
+
+                        ColumnLayout {                                                        
+                            width: mainSettingsScrollView.width
+                            height: children.height
 
                             SettingsGroupTitle { text: qsTranslate("RDM","Main Settings") }
 
                             GridLayout {
                                 columns: 2
 
+                                Layout.fillWidth: true
+
                                 Label { text: qsTranslate("RDM","Name:") }
 
                                 TextField {
@@ -202,7 +209,7 @@ Dialog {
                                     id: sslRadioButton
                                     Layout.columnSpan: 2
                                     text: qsTranslate("RDM","SSL")
-                                    checked: root.settings ? root.settings.sslEnabled : false
+                                    checked: root.settings ? root.settings.sslEnabled && !root.sshEnabled : false
                                     Component.onCompleted: root.sslEnabled = Qt.binding(function() { return sslRadioButton.checked })
                                     onCheckedChanged: {
                                         root.settings.sslEnabled = checked
@@ -358,6 +365,16 @@ Dialog {
                                             text: root.settings ? root.settings.sshPassword : ""
                                             onTextChanged: root.settings.sshPassword = text
                                         }
+                                    }                                   
+
+                                    BetterCheckbox {
+                                        id: sshTLSoverSSHCheckbox
+                                        objectName: "rdm_connection_security_ssh_tls_over_ssh"
+                                        Layout.fillWidth: true
+                                        Layout.columnSpan: 2
+                                        text: qsTranslate("RDM","Enable TLS-over-SSH (<b>AWS ElastiCache</b> <b>Encryption in-transit</b>)")
+                                        checked: root.settings ? root.settings.sslEnabled && root.sshEnabled : false
+                                        onCheckedChanged: root.settings.sslEnabled = checked
                                     }
                                 }
                             }