diff --git a/Configuration.cpp b/Configuration.cpp
index c8652a599..ee67abc77 100644
--- a/Configuration.cpp
+++ b/Configuration.cpp
@@ -1542,6 +1542,8 @@ void Configuration::impl::read_settings ()
Contest_Name_ = settings_->value ("Contest_Name",QString {}).toString ();
ui_->Field_Day_Exchange->setText(FD_exchange_);
ui_->RTTY_Exchange->setText(RTTY_exchange_);
+ ui_->Contest_Name->setText(Contest_Name_);
+
if (next_font_.fromString (settings_->value ("Font", QGuiApplication::font ().toString ()).toString ())
&& next_font_ != font_)
{
diff --git a/Configuration.ui b/Configuration.ui
index 1f91e09cd..acf225f5d 100644
--- a/Configuration.ui
+++ b/Configuration.ui
@@ -3076,13 +3076,13 @@ Right click for insert and delete options.
- PACC
+
4
- 2
+ 0
Qt::AlignCenter
@@ -3336,13 +3336,13 @@ Right click for insert and delete options.
-
-
+
+
+
+
-
-
-
+
diff --git a/widgets/mainwindow.cpp b/widgets/mainwindow.cpp
index bfad377f2..331cb4627 100644
--- a/widgets/mainwindow.cpp
+++ b/widgets/mainwindow.cpp
@@ -5771,7 +5771,7 @@ void MainWindow::genCQMsg ()
( tlist.at(1)==my_callsign or
tlist.at(2)==my_callsign ) and
stdCall(my_callsign)) {
- if(m_config.Individual_Contest_Name()) {
+ if(m_config.Individual_Contest_Name() && m_config.Contest_Name() != "") {
m_cqStr = m_config.Contest_Name();
} else {
if(SpecOp::NA_VHF == m_specOp) m_cqStr="TEST";