diff --git a/app/src/main/java/cz/bugsy/passwordzebra/MainActivity.kt b/app/src/main/java/cz/bugsy/passwordzebra/MainActivity.kt
index d027a54..43c071f 100644
--- a/app/src/main/java/cz/bugsy/passwordzebra/MainActivity.kt
+++ b/app/src/main/java/cz/bugsy/passwordzebra/MainActivity.kt
@@ -16,6 +16,8 @@ class MainActivity : AppCompatActivity() {
     private lateinit var infoTextView: TextView
     private lateinit var switchWithoutSpaces: com.google.android.material.switchmaterial.SwitchMaterial
     private lateinit var switchSpecialChars: com.google.android.material.switchmaterial.SwitchMaterial
+    private lateinit var passwordLengthPicker: android.widget.NumberPicker
+    private lateinit var numPasswordsPicker: android.widget.NumberPicker
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
@@ -28,6 +30,7 @@ class MainActivity : AppCompatActivity() {
         switchWithoutSpaces = findViewById(R.id.switchWithoutSpaces)
         switchSpecialChars = findViewById(R.id.switchSpecialChars)
 
+
         generateButton.setOnClickListener {
             generatePassword()
         }
@@ -42,6 +45,7 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun generatePassword() {
+
         val password = generateRandomWords(6)
 
         passwordTextView.text = password
@@ -93,7 +97,13 @@ class MainActivity : AppCompatActivity() {
     }
 
     private fun copyToClipboard(text: String, clipboardManager: ClipboardManager) {
-        val clipData = ClipData.newPlainText("Password", text)
+
+        val clipData = if (switchWithoutSpaces.isChecked)
+        { val textNoSpaces = text.filter { !it.isWhitespace() }
+        ClipData.newPlainText("Password", textNoSpaces)
+        } else {
+            ClipData.newPlainText("Password", text)
+        }
         clipboardManager.setPrimaryClip(clipData)
     }
 
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index fa406ea..71dcabf 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -40,7 +40,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginBottom="16dp"/>
 
-    <android.widget.NumberPicker
+    <NumberPicker
         android:id="@+id/passwordLengthPicker"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -48,7 +48,7 @@
         android:layout_centerHorizontal="true"
         android:layout_marginTop="32dp"/>
 
-    <android.widget.NumberPicker
+    <NumberPicker
         android:id="@+id/numPasswordsPicker"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"