diff --git a/administrator/components/com_patchtester/PatchTester/GitHub/GitHub.php b/administrator/components/com_patchtester/PatchTester/GitHub/GitHub.php
index cedf0d55..5497e856 100644
--- a/administrator/components/com_patchtester/PatchTester/GitHub/GitHub.php
+++ b/administrator/components/com_patchtester/PatchTester/GitHub/GitHub.php
@@ -70,27 +70,6 @@ protected function fetchUrl($path, $page = 0, $limit = 0)
 		// Get a new Uri object using the API URL and given path.
 		$uri = new Uri($this->options->get('api.url') . $path);
 
-		// Only apply basic authentication if an access token is not set
-		if ($this->options->get('gh.token', false) === false)
-		{
-			// Use basic authentication
-			if ($this->options->get('api.username', false))
-			{
-				$username = $this->options->get('api.username');
-				$username = str_replace('@', '%40', $username);
-				$username = str_replace('#', '%23', $username);
-				$uri->setUser($username);
-			}
-
-			if ($this->options->get('api.password', false))
-			{
-				$password = $this->options->get('api.password');
-				$password = str_replace('@', '%40', $password);
-				$password = str_replace('#', '%23', $password);
-				$uri->setPass($password);
-			}
-		}
-
 		// If we have a defined page number add it to the JUri object.
 		if ($page > 0)
 		{
diff --git a/administrator/components/com_patchtester/PatchTester/Helper.php b/administrator/components/com_patchtester/PatchTester/Helper.php
index ddf2312c..93a4fd2f 100644
--- a/administrator/components/com_patchtester/PatchTester/Helper.php
+++ b/administrator/components/com_patchtester/PatchTester/Helper.php
@@ -48,12 +48,6 @@ public static function initializeGithub()
 		{
 			$options->set('gh.token', $params->get('gh_token', ''));
 		}
-		// Set the username and password if set in the params
-		elseif ($params->get('gh_user', '') && $params->get('gh_password'))
-		{
-			$options->set('api.username', $params->get('gh_user', ''));
-			$options->set('api.password', $params->get('gh_password', ''));
-		}
 		// Display a message about the lowered API limit without credentials
 		else
 		{
diff --git a/administrator/components/com_patchtester/config.xml b/administrator/components/com_patchtester/config.xml
index d45b6077..59a96848 100644
--- a/administrator/components/com_patchtester/config.xml
+++ b/administrator/components/com_patchtester/config.xml
@@ -60,31 +60,9 @@
 
 			>
 			<option value="">JNONE</option>
-			<option value="credentials">COM_PATCHTESTER_FIELD_GH_AUTH_OPTION_CREDENTIALS</option>
 			<option value="token">COM_PATCHTESTER_FIELD_GH_AUTH_OPTION_TOKEN</option>
 		</field>
 
-		<!-- Note: Default username is a space to avoid browser autocomplete. -->
-		<field
-			name="gh_user"
-			type="text"
-			label="COM_PATCHTESTER_FIELD_GH_USER_LABEL"
-			description="COM_PATCHTESTER_FIELD_GH_USER_DESC"
-			autocomplete="off"
-			default=" "
-			showon="gh_auth:credentials"
-		/>
-
-		<field
-			name="gh_password"
-			type="password"
-			label="COM_PATCHTESTER_FIELD_GH_PASSWORD_LABEL"
-			description="COM_PATCHTESTER_FIELD_GH_PASSWORD_DESC"
-			autocomplete="off"
-			default=""
-			showon="gh_auth:credentials"
-		/>
-
 		<field
 			name="gh_token"
 			type="text"
diff --git a/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini b/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
index 609779c2..96a73f8a 100644
--- a/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
+++ b/administrator/components/com_patchtester/language/en-GB/en-GB.com_patchtester.ini
@@ -36,16 +36,11 @@ COM_PATCHTESTER_FETCH_PAGE_NUMBER="Processing page %s of GitHub data"
 COM_PATCHTESTER_FETCH_PAGE_NUMBER_OF_TOTAL="Processing page %1$s of %2$s pages of GitHub data"
 COM_PATCHTESTER_FETCH_PROCESSING="Processing data from GitHub"
 COM_PATCHTESTER_FETCH_SUCCESSFUL="Successfully retrieved pull requests"
-COM_PATCHTESTER_FIELD_GH_AUTH_DESC="Select 'Credentials' to use authentication through your GitHub Username and Password, or 'Token' for a GitHub API Token"
+COM_PATCHTESTER_FIELD_GH_AUTH_DESC="Select 'Token' for a GitHub API Token"
 COM_PATCHTESTER_FIELD_GH_AUTH_LABEL="GitHub Authentication Method"
-COM_PATCHTESTER_FIELD_GH_AUTH_OPTION_CREDENTIALS="Credentials"
 COM_PATCHTESTER_FIELD_GH_AUTH_OPTION_TOKEN="Token"
-COM_PATCHTESTER_FIELD_GH_PASSWORD_LABEL="GitHub Account Password"
-COM_PATCHTESTER_FIELD_GH_PASSWORD_DESC="Password for the account entered in the 'GitHub Account Username' field. Note that accounts using Two Factor Authentication will not work with username and password authentication."
 COM_PATCHTESTER_FIELD_GH_TOKEN_DESC="Use this field to input a GitHub API Token in place of your username and password. Note that this is required if your account has Two Factor Authentication enabled."
 COM_PATCHTESTER_FIELD_GH_TOKEN_LABEL="GitHub Token"
-COM_PATCHTESTER_FIELD_GH_USER_LABEL="GitHub Account Username"
-COM_PATCHTESTER_FIELD_GH_USER_DESC="Name of account on GitHub to use to authenticate to the API."
 COM_PATCHTESTER_FIELD_ORG_LABEL="Custom Project Owner"
 COM_PATCHTESTER_FIELD_ORG_DESC="A username or organisation on GitHub to monitor pull requests for."
 COM_PATCHTESTER_FIELD_REPO_LABEL="Custom Project Repository"
@@ -71,7 +66,7 @@ COM_PATCHTESTER_GITHUB="GitHub"
 COM_PATCHTESTER_HEADING_FETCH_DATA="Fetching GitHub Data"
 COM_PATCHTESTER_JISSUE="J! Issue"
 COM_PATCHTESTER_JISSUES="Issue Tracker"
-COM_PATCHTESTER_NO_CREDENTIALS="You have not entered your user credentials in the Options. This will limit you to only 60 requests to the GitHub API per hour. Adding your credentials will allow 5,000 requests per hour."
+COM_PATCHTESTER_NO_CREDENTIALS="You have not entered your GitHub API token in the Options. This will limit you to only 60 requests to the GitHub API per hour. Configuring authentication via an API token will allow 5,000 requests per hour."
 COM_PATCHTESTER_NO_FILES_TO_PATCH="There are no files to patch from this pull request. This may mean that the files in the pull request are not present in your installation."
 COM_PATCHTESTER_NO_ITEMS="No data has been retrieved from GitHub, please click the 'Fetch Data' button in the toolbar to retrieve the open pull requests."
 COM_PATCHTESTER_NOT_APPLIED="Not Applied"