diff --git a/GreenshotConfluencePlugin/ConfluenceConfiguration.cs b/GreenshotConfluencePlugin/ConfluenceConfiguration.cs
index ff7319c2a..1590ee385 100644
--- a/GreenshotConfluencePlugin/ConfluenceConfiguration.cs
+++ b/GreenshotConfluencePlugin/ConfluenceConfiguration.cs
@@ -75,5 +75,10 @@ namespace GreenshotConfluencePlugin {
 			get;
 			set;
 		}
+        [IniProperty("IncludePersonSpaces", Description = "Include personal spaces in the search & browse spaces list", DefaultValue = "False")]
+        public bool IncludePersonSpaces {
+            get;
+            set;
+        }
 	}
 }
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml b/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml
index 308a57c5a..1a41a7c7c 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml
@@ -10,7 +10,8 @@
 	</Window.Resources>
 
 	<StackPanel>
-		<CheckBox IsChecked="{Binding OpenPageAfterUpload}" Content="{l:Translate open_page_after_upload}"/>
+        <CheckBox IsChecked="{Binding IncludePersonSpaces}" Content="{l:Translate include_person_spaces}"/>
+        <CheckBox IsChecked="{Binding OpenPageAfterUpload}" Content="{l:Translate open_page_after_upload}"/>
 		<CheckBox IsChecked="{Binding CopyWikiMarkupForImageToClipboard}" Content="{l:Translate copy_wikimarkup}"/>
 		<StackPanel Orientation="Horizontal">
 			<Label Content="{l:Translate label_url}" />
@@ -25,8 +26,8 @@
 			<ComboBox ItemsSource="{Binding Source={StaticResource outputFormats},Path=DisplayNames}" SelectedValue="{Binding UploadFormat, Converter={StaticResource outputFormats}}" />
 		</StackPanel>
 		<StackPanel Orientation="Horizontal" HorizontalAlignment="Right">
+            <Button IsDefault="True" Content="{l:Translate OK}" Click="Button_OK_Click"/>
             <Button IsCancel="True" Content="{l:Translate CANCEL}"/>
-            <Button IsDefault="True" Content="{l:Translate OK}" Click="Button_Click"/>
-		</StackPanel>
+        </StackPanel>
 	</StackPanel>
 </Window>
\ No newline at end of file
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs b/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs
index b41d8c34b..ab2073fa5 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceConfigurationForm.xaml.cs
@@ -39,7 +39,7 @@ namespace GreenshotConfluencePlugin {
 			InitializeComponent();
 		}
 		
-		void Button_Click(object sender, RoutedEventArgs e) {
+		void Button_OK_Click(object sender, RoutedEventArgs e) {
 			DialogResult = true;
 		}
 	}
diff --git a/GreenshotConfluencePlugin/Languages/language_confluenceplugin-en-US.xml b/GreenshotConfluencePlugin/Languages/language_confluenceplugin-en-US.xml
index 851734796..dfc8f1580 100644
--- a/GreenshotConfluencePlugin/Languages/language_confluenceplugin-en-US.xml
+++ b/GreenshotConfluencePlugin/Languages/language_confluenceplugin-en-US.xml
@@ -70,5 +70,8 @@
   <resource name="loading">
 		Confluence data is loading, please wait...
 	</resource>
+  <resource name="include_person_spaces">
+    Include personal spaces in search and browsing
+  </resource>
  </resources>
 </language>
\ No newline at end of file