diff --git a/src/core/PassphraseGenerator.cpp b/src/core/PassphraseGenerator.cpp
index 37f90c67f..dca687226 100644
--- a/src/core/PassphraseGenerator.cpp
+++ b/src/core/PassphraseGenerator.cpp
@@ -45,7 +45,13 @@ double PassphraseGenerator::calculateEntropy(QString passphrase)
 
 void PassphraseGenerator::setWordCount(int wordCount)
 {
-    m_wordCount = wordCount;
+    if (wordCount > 0) {
+        m_wordCount = wordCount; 
+    } else {
+        // safe default if something goes wrong
+        m_wordCount = 7;
+    }
+ 
 }
 
 void PassphraseGenerator::setWordlist(QString path)
diff --git a/src/gui/PasswordGeneratorWidget.cpp b/src/gui/PasswordGeneratorWidget.cpp
index 2bc528e19..423d6da26 100644
--- a/src/gui/PasswordGeneratorWidget.cpp
+++ b/src/gui/PasswordGeneratorWidget.cpp
@@ -340,7 +340,7 @@ void PasswordGeneratorWidget::updateGenerator()
             m_ui->buttonGenerate->setEnabled(false);
         }
     } else {
-        int minWordCount = 0;
+        int minWordCount = 1;
 
         if (m_ui->spinBoxWordCount->value() < minWordCount) {
             m_updatingSpinBox = true;
diff --git a/src/gui/PasswordGeneratorWidget.ui b/src/gui/PasswordGeneratorWidget.ui
index 5cd37ad06..87111c0ab 100644
--- a/src/gui/PasswordGeneratorWidget.ui
+++ b/src/gui/PasswordGeneratorWidget.ui
@@ -204,7 +204,7 @@ QProgressBar::chunk {
       <enum>QTabWidget::Rounded</enum>
      </property>
      <property name="currentIndex">
-      <number>1</number>
+      <number>0</number>
      </property>
      <widget class="QWidget" name="passwordWidget">
       <attribute name="title">