diff --git a/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositorySettingsPage.java b/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositorySettingsPage.java
index be2d836d14..85ea76add7 100644
--- a/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositorySettingsPage.java
+++ b/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/gist/GistRepositorySettingsPage.java
@@ -45,7 +45,7 @@ public GistRepositorySettingsPage(TaskRepository taskRepository) {
 		super(Messages.GistRepositorySettingsPage_Title,
 				Messages.GistRepositorySettingsPage_Description, taskRepository);
 		setNeedsAnonymousLogin(false);
-		setUseToken(true, false);
+		setUseTokenForAuthentication(false);
 	}
 
 	@Override
diff --git a/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java b/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java
index a11e0838cd..cad16cc5bd 100644
--- a/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java
+++ b/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/issue/IssueRepositorySettingsPage.java
@@ -47,7 +47,7 @@ public IssueRepositorySettingsPage(final TaskRepository taskRepository) {
 		super(Messages.IssueRepositorySettingsPage_Title,
 				Messages.IssueRepositorySettingsPage_Description,
 				taskRepository);
-		setUseToken(true, true);
+		setUseTokenForAuthentication(true);
 
 	}
 
diff --git a/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositorySettingsPage.java b/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositorySettingsPage.java
index 5a89e12553..ddb08866df 100644
--- a/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositorySettingsPage.java
+++ b/mylyn.github/org.eclipse.mylyn.github.ui/src/org/eclipse/mylyn/internal/github/ui/pr/PullRequestRepositorySettingsPage.java
@@ -47,7 +47,7 @@ public PullRequestRepositorySettingsPage(final TaskRepository taskRepository) {
 		super(Messages.PullRequestRepositorySettingsPage_Title,
 				Messages.PullRequestRepositorySettingsPage_Description,
 				taskRepository);
-		setUseToken(true, true);
+		setUseTokenForAuthentication(true);
 
 	}
 
diff --git a/mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java b/mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
index 24a5765eb1..1c1419af54 100644
--- a/mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
+++ b/mylyn.tasks/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/tasks/ui/wizards/AbstractRepositorySettingsPage.java
@@ -281,7 +281,7 @@ public abstract class AbstractRepositorySettingsPage extends AbstractTaskReposit
 	/**
 	 * @since 4.1
 	 */
-	private boolean useTokenForAuthentication;
+	private boolean useTokenForAuthentication = false;
 
 	private boolean userOptional = true;
 
@@ -2489,8 +2489,8 @@ public boolean isUserOptional() {
 	 * @param userOptional
 	 *            Allow username as well as token
 	 */
-	public void setUseToken(final boolean useTokenForAuthentication, final boolean userOptional) {
-		this.useTokenForAuthentication = useTokenForAuthentication;
+	public void setUseTokenForAuthentication(final boolean userOptional) {
+		this.useTokenForAuthentication = true;
 		this.userOptional = userOptional;
 	}