diff --git a/GreenshotConfluencePlugin/ConfluencePluginBase.cs b/GreenshotConfluencePlugin/ConfluencePluginBase.cs
index 009df3dd6..431239358 100644
--- a/GreenshotConfluencePlugin/ConfluencePluginBase.cs
+++ b/GreenshotConfluencePlugin/ConfluencePluginBase.cs
@@ -117,8 +117,8 @@ namespace GreenshotConfluencePlugin {
 				confluenceConnector = new ConfluenceConnector(config.Url, config.Timeout);
 			}
 
+			ConfluenceForm confluenceForm = new ConfluenceForm(confluenceConnector);
 			if (confluenceConnector.isLoggedIn()) {
-				ConfluenceForm confluenceForm = new ConfluenceForm(confluenceConnector);
 				confluenceForm.setFilename(host.GetFilename(config.UploadFormat, imageEditor.CaptureDetails));
 				DialogResult result = confluenceForm.ShowDialog();
 				if (result == DialogResult.OK) {
diff --git a/GreenshotConfluencePlugin/Forms/ConfluenceForm.cs b/GreenshotConfluencePlugin/Forms/ConfluenceForm.cs
index 41f3bfd12..116818afa 100644
--- a/GreenshotConfluencePlugin/Forms/ConfluenceForm.cs
+++ b/GreenshotConfluencePlugin/Forms/ConfluenceForm.cs
@@ -23,20 +23,30 @@ using System.Drawing;
 using System.Windows.Forms;
 
 using Confluence;
+using Greenshot.Core;
 
 namespace GreenshotConfluencePlugin {
 	/// <summary>
 	/// Description of ConfluenceForm.
 	/// </summary>
 	public partial class ConfluenceForm : Form {
-		private ConfluenceConnector confluence;
-		public ConfluenceForm(ConfluenceConnector confluence) {
+		private ConfluenceConnector confluenceConnector;
+		private ILanguage language = Language.GetInstance();
+
+		public ConfluenceForm(ConfluenceConnector confluenceConnector) {
 			//
 			// The InitializeComponent() call is required for Windows Forms designer support.
 			//
 			InitializeComponent();
 
-			this.confluence = confluence;
+			this.confluenceConnector = confluenceConnector;
+			try {
+				if (!confluenceConnector.isLoggedIn()) {
+					confluenceConnector.login();
+				}
+			} catch (Exception e) {
+				MessageBox.Show(language.GetFormattedString(LangKey.login_error, e.Message));
+			}
 		}
 		
 		public void setFilename(string filename) {
@@ -44,8 +54,8 @@ namespace GreenshotConfluencePlugin {
 		}
 
 		public void upload(byte [] buffer) {
-			Page page = confluence.getPage(textBox_space.Text, textBox_page.Text);
-			confluence.addAttachment(page.id, " image/png", "HALLO", textBox_filename.Text, buffer);
+			Page page = confluenceConnector.getPage(textBox_space.Text, textBox_page.Text);
+			confluenceConnector.addAttachment(page.id, " image/png", "HALLO", textBox_filename.Text, buffer);
 		}
 		
 		void ButtonCancelClick(object sender, EventArgs e) {
diff --git a/GreenshotJiraPlugin/JiraPluginBase.cs b/GreenshotJiraPlugin/JiraPluginBase.cs
index 395015e77..85b836a1f 100644
--- a/GreenshotJiraPlugin/JiraPluginBase.cs
+++ b/GreenshotJiraPlugin/JiraPluginBase.cs
@@ -116,9 +116,9 @@ namespace GreenshotJiraPlugin {
 			if (jiraConnector == null) {
 				jiraConnector = new JiraConnector(config.Url, config.Timeout);
 			}
+			JiraForm jiraForm = new JiraForm(jiraConnector);
 
 			if (jiraConnector.isLoggedIn()) {
-				JiraForm jiraForm = new JiraForm(jiraConnector);
 				jiraForm.setFilename(host.GetFilename(config.UploadFormat, imageEditor.CaptureDetails));
 				DialogResult result = jiraForm.ShowDialog();
 				if (result == DialogResult.OK) {