diff --git a/ChangeLog b/ChangeLog
index 46559f19..3d994289 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -17497,3 +17497,6 @@
 	* Changed column headings to lower-case in rdlogmanager(1).
 2018-08-20 Fred Gleason <fredg@paravelsystems.com>
 	* Fixed a regression in rivendell_filter(1) that caused a segfault.
+2018-08-20 Fred Gleason <fredg@paravelsystems.com>
+	* Fixed a bug in rdadmin(1) that failed to close the program after
+	a failed login.
diff --git a/rdadmin/login.cpp b/rdadmin/login.cpp
index 4a9fc370..74217abd 100644
--- a/rdadmin/login.cpp
+++ b/rdadmin/login.cpp
@@ -136,13 +136,13 @@ void Login::okData()
 {
   *login_name=login_name_edit->text();
   *login_password=login_password_edit->text();
-  done(0);
+  done(true);
 }
 
 
 void Login::cancelData()
 {
-  done(1);
+  done(false);
 }
 
 
diff --git a/rdadmin/rdadmin.cpp b/rdadmin/rdadmin.cpp
index 7484d016..6c076185 100644
--- a/rdadmin/rdadmin.cpp
+++ b/rdadmin/rdadmin.cpp
@@ -123,19 +123,19 @@ MainWidget::MainWidget(QWidget *parent)
   // Log In
   //
   Login *login=new Login(&admin_username,&admin_password,this);
-  if(login->exec()!=0) {
+  if(!login->exec()) {
     exit(0);
   }
   rda->user()->setName(admin_username);
   if(!rda->user()->checkPassword(admin_password,false)) {
     QMessageBox::warning(this,"Login Failed","Login Failed!.\n");
-    exiting=true;
+    exit(1);
   }
   else {
     if(!rda->user()->adminConfig()) {
       QMessageBox::warning(this,tr("Insufficient Priviledges"),
          tr("This account has insufficient priviledges for this operation."));
-      exiting=true;
+      exit(1);
     }
   }