diff --git a/ChangeLog b/ChangeLog
index 95b712a6..2f0993a7 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -21940,3 +21940,5 @@
 	* Added 'RDMainWindow' to rdadmin(1).
 2021-06-21 Fred Gleason <fredg@paravelsystems.com>
 	* Added 'RDMainWindow' to rdcartslots(1).
+2021-06-21 Fred Gleason <fredg@paravelsystems.com>
+	* Added 'RDMainWindow' to rdlogin(1).
diff --git a/rdlogin/rdlogin.cpp b/rdlogin/rdlogin.cpp
index 25a4f22f..8c38ea61 100644
--- a/rdlogin/rdlogin.cpp
+++ b/rdlogin/rdlogin.cpp
@@ -28,7 +28,7 @@
 #include "rdlogin.h"
 
 MainWidget::MainWidget(RDConfig *c,QWidget *parent)
-  : RDWidget(c,parent)
+  : RDMainWindow("rdlogin",c)
 {
   login_resize=false;
   login_user_width=160;
@@ -154,7 +154,7 @@ MainWidget::MainWidget(RDConfig *c,QWidget *parent)
 
   login_resize=true;
 
-  resizeEvent(NULL);
+  loadSettings(true);
 }
 
 
@@ -178,6 +178,12 @@ QSizePolicy MainWidget::sizePolicy() const
 }
 
 
+void MainWidget::closeEvent(QCloseEvent *e)
+{
+  quitMainWidget();
+}
+
+
 void MainWidget::connectedData(bool state)
 {
 }
@@ -237,12 +243,14 @@ void MainWidget::logoutData()
 
 void MainWidget::cancelData()
 {
+  saveSettings();
   exit(0);
 }
 
 
 void MainWidget::quitMainWidget()
 {
+  saveSettings();
   qApp->quit();
 }
 
@@ -296,7 +304,6 @@ int main(int argc,char *argv[])
   RDConfig *config=new RDConfig();
   config->load();
   MainWidget *w=new MainWidget(config);
-  w->setGeometry(QRect(QPoint(0,0),w->sizeHint()));
   w->show();
   return a.exec();
 }
diff --git a/rdlogin/rdlogin.h b/rdlogin/rdlogin.h
index c642a2cb..e22ca0a4 100644
--- a/rdlogin/rdlogin.h
+++ b/rdlogin/rdlogin.h
@@ -26,12 +26,13 @@
 #include <QLineEdit>
 #include <QPushButton>
 
+#include <rdmainwindow.h>
 #include <rduserlistmodel.h>
 #include <rdwidget.h>
 
 #define RDLOGIN_USAGE "\n"
 
-class MainWidget : public RDWidget
+class MainWidget : public RDMainWindow
 {
   Q_OBJECT
  public:
@@ -40,6 +41,9 @@ class MainWidget : public RDWidget
   QSize sizeHint() const;
   QSizePolicy sizePolicy() const;
 
+ protected:
+  void closeEvent(QCloseEvent *e);
+				 
  private slots:
   void connectedData(bool state);
   void userData();