diff --git a/src/main/java/de/deadlocker8/budgetmaster/backup/RemoteGitBackupTask.java b/src/main/java/de/deadlocker8/budgetmaster/backup/RemoteGitBackupTask.java
index b269a360d3eb6dbecf2a2eb613a5b2e25f85de34..37938d37f9484194142fd04d3df7a57f9641488f 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/backup/RemoteGitBackupTask.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/backup/RemoteGitBackupTask.java
@@ -38,7 +38,7 @@ public class RemoteGitBackupTask extends BackupTask
 		LOGGER.debug(MessageFormat.format("Starting backup with strategy \"{0}\"", AutoBackupStrategy.GIT_REMOTE));
 
 		final Settings settings = settingsService.getSettings();
-		final UsernamePasswordCredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider(settings.getAutoBackupGitUserName(), settings.getAutoBackupGitPassword());
+		final UsernamePasswordCredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider(settings.getAutoBackupGitUserName(), settings.getAutoBackupGitToken());
 		final String remote = settings.getAutoBackupGitUrl();
 
 		try
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java b/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
index a1ee861e69f304736e21138f103e20e9c80d958f..57fcae4624fd3c1a91966086ef608a472d67c4b5 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/Settings.java
@@ -33,7 +33,7 @@ public class Settings
 	private Integer autoBackupFilesToKeep;
 	private String autoBackupGitUrl;
 	private String autoBackupGitUserName;
-	private String autoBackupGitPassword;
+	private String autoBackupGitToken;
 
 	private Integer installedVersionCode;
 	private Boolean whatsNewShownForCurrentVersion;
@@ -60,7 +60,7 @@ public class Settings
 		defaultSettings.setAutoBackupFilesToKeep(3);
 		defaultSettings.setAutoBackupGitUrl("");
 		defaultSettings.setAutoBackupGitUserName("");
-		defaultSettings.setAutoBackupGitPassword("");
+		defaultSettings.setAutoBackupGitToken("");
 		defaultSettings.setInstalledVersionCode(0);
 		defaultSettings.setWhatsNewShownForCurrentVersion(false);
 		defaultSettings.setShowFirstUseBanner(true);
@@ -227,14 +227,14 @@ public class Settings
 		this.autoBackupGitUserName = gitUserName;
 	}
 
-	public String getAutoBackupGitPassword()
+	public String getAutoBackupGitToken()
 	{
-		return autoBackupGitPassword;
+		return autoBackupGitToken;
 	}
 
-	public void setAutoBackupGitPassword(String gitPassword)
+	public void setAutoBackupGitToken(String gitToken)
 	{
-		this.autoBackupGitPassword = gitPassword;
+		this.autoBackupGitToken = gitToken;
 	}
 
 	public Integer getInstalledVersionCode()
@@ -291,7 +291,7 @@ public class Settings
 				", autoBackupFilesToKeep=" + autoBackupFilesToKeep +
 				", autoBackupGitUrl='" + autoBackupGitUrl + '\'' +
 				", autoBackupGitUserName='" + autoBackupGitUserName + '\'' +
-				", autoBackupGitPassword='" + autoBackupGitPassword + '\'' +
+				", autoBackupGitToken='" + autoBackupGitToken + '\'' +
 				", installedVersionCode=" + installedVersionCode +
 				", whatsNewShownForCurrentVersion=" + whatsNewShownForCurrentVersion +
 				", showFirstUseBanner=" + showFirstUseBanner +
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
index b425eb212ba820b266564493d9fb6cdf46458d66..86efc84b377322aa059c8813870999d9ef285015 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsController.java
@@ -121,9 +121,9 @@ public class SettingsController extends BaseController
 			settings.setAutoBackupStrategy(AutoBackupStrategy.NONE);
 		}
 
-		if(settings.getAutoBackupGitPassword().equals(PASSWORD_PLACEHOLDER))
+		if(settings.getAutoBackupGitToken().equals(PASSWORD_PLACEHOLDER))
 		{
-			settings.setAutoBackupGitPassword(settingsService.getSettings().getAutoBackupGitPassword());
+			settings.setAutoBackupGitToken(settingsService.getSettings().getAutoBackupGitToken());
 		}
 
 		final String cron = scheduleTaskService.computeCron(settings.getAutoBackupTime(), settings.getAutoBackupDays());
@@ -135,7 +135,7 @@ public class SettingsController extends BaseController
 			settings.setAutoBackupTime(defaultSettings.getAutoBackupTime());
 			settings.setAutoBackupFilesToKeep(defaultSettings.getAutoBackupFilesToKeep());
 			settings.setAutoBackupGitUserName(defaultSettings.getAutoBackupGitUserName());
-			settings.setAutoBackupGitPassword(defaultSettings.getAutoBackupGitPassword());
+			settings.setAutoBackupGitToken(defaultSettings.getAutoBackupGitToken());
 		}
 		else
 		{
@@ -368,14 +368,14 @@ public class SettingsController extends BaseController
 	public String testGit(Model model,
 						  @RequestParam(value = "autoBackupGitUrl") String autoBackupGitUrl,
 						  @RequestParam(value = "autoBackupGitUserName") String autoBackupGitUserName,
-						  @RequestParam(value = "autoBackupGitPassword") String autoBackupGitPassword)
+						  @RequestParam(value = "autoBackupGitToken") String autoBackupGitToken)
 	{
-		if(autoBackupGitPassword.equals(PASSWORD_PLACEHOLDER))
+		if(autoBackupGitToken.equals(PASSWORD_PLACEHOLDER))
 		{
-			autoBackupGitPassword = settingsService.getSettings().getAutoBackupGitPassword();
+			autoBackupGitToken = settingsService.getSettings().getAutoBackupGitToken();
 		}
 
-		final CredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider(autoBackupGitUserName, autoBackupGitPassword);
+		final CredentialsProvider credentialsProvider = new UsernamePasswordCredentialsProvider(autoBackupGitUserName, autoBackupGitToken);
 		final boolean isValidConnection = GitHelper.checkConnection(autoBackupGitUrl, credentialsProvider);
 
 		String localizedMessage = Localization.getString("settings.backup.auto.git.test.fail");
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
index 10f5c745fd3fe29d031063565f5c804df19135dd..07fdd13740bb65f094f5038e04e627e3c5655834 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsService.java
@@ -85,9 +85,9 @@ public class SettingsService
 		{
 			settings.setAutoBackupGitUserName(defaultSettings.getAutoBackupGitUserName());
 		}
-		if(settings.getAutoBackupGitPassword() == null)
+		if(settings.getAutoBackupGitToken() == null)
 		{
-			settings.setAutoBackupGitPassword(defaultSettings.getAutoBackupGitPassword());
+			settings.setAutoBackupGitToken(defaultSettings.getAutoBackupGitToken());
 		}
 		if(settings.getInstalledVersionCode() == null)
 		{
diff --git a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsValidator.java b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsValidator.java
index 74c3070bfc7b8344c94c4307cf3b11242cd98cc9..60ad353a4ede3f4f97bfc902f053fe5c47e0cb2c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsValidator.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/settings/SettingsValidator.java
@@ -29,7 +29,7 @@ public class SettingsValidator implements Validator
 		{
 			ValidationUtils.rejectIfEmptyOrWhitespace(errors, "autoBackupGitUrl", Strings.WARNING_EMPTY_GIT_URL);
 			ValidationUtils.rejectIfEmptyOrWhitespace(errors, "autoBackupGitUserName", Strings.WARNING_EMPTY_GIT_USER_NAME);
-			ValidationUtils.rejectIfEmptyOrWhitespace(errors, "autoBackupGitPassword", Strings.WARNING_EMPTY_GIT_PASSWORD);
+			ValidationUtils.rejectIfEmptyOrWhitespace(errors, "autoBackupGitToken", Strings.WARNING_EMPTY_GIT_TOKEN);
 		}
 	}
 }
\ No newline at end of file
diff --git a/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java b/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java
index a812f55b47d2c932c754a78d89c9626104fa88ef..cb176dab3c72f2529d3a6b4134018d26a132a171 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/utils/Strings.java
@@ -31,7 +31,7 @@ public class Strings
 	public static final String WARNING_DUPLICATE_TEMPLATE_NAME = "warning.duplicate.template.name";
 	public static final String WARNING_EMPTY_GIT_URL = "warning.empty.git.url";
 	public static final String WARNING_EMPTY_GIT_USER_NAME = "warning.empty.git.user.name";
-	public static final String WARNING_EMPTY_GIT_PASSWORD = "warning.empty.git.password";
+	public static final String WARNING_EMPTY_GIT_TOKEN = "warning.empty.git.token";
 
 	//REPORT
 	public static final String REPORT_FOOTER_LEFT = "report.footer.left";
diff --git a/src/main/resources/languages/base_de.properties b/src/main/resources/languages/base_de.properties
index a9cb8a5c45d0e1574dfaf6bbf2624ae252fcdd71..d524448149957523eb5accde9db6acc7c5532419 100644
--- a/src/main/resources/languages/base_de.properties
+++ b/src/main/resources/languages/base_de.properties
@@ -146,7 +146,7 @@ warning.duplicate.template.name=Es existiert bereits eine Vorlage mit diesem Nam
 warning.transaction.date=Das angegebene Datum entspricht nicht dem erlaubten Format. Erwartetes Format: DD.MM.YY, DDMMYY, DD.MM.YYYY, DDMMYYYY.
 warning.empty.git.url=Bitte gib die URL zum git-Server ein.
 warning.empty.git.user.name=Bitte gib deinen git-Nutzernamen ein.
-warning.empty.git.password=Bitte gib dein git-Passwort ein.
+warning.empty.git.token=Bitte gib dein git-Zugriffstoken ein.
 
 
 # UI
@@ -210,7 +210,7 @@ settings.backup.auto.files.to.keep=Anzahl aufzubewahrender Backups (0 für unbeg
 settings.backup.auto.next=Nächste Ausführung
 settings.backup.auto.git.url=Adresse des Git-Servers
 settings.backup.auto.git.user.name=Git Nutzername
-settings.backup.auto.git.password=Git Passwort
+settings.backup.auto.git.token=Git Zugriffstoken
 settings.backup.auto.git.test=Verbindung testen
 settings.backup.auto.git.test.success=Verbindung erfolgreich!
 settings.backup.auto.git.test.fail=Verbindung fehlgeschlagen!
diff --git a/src/main/resources/languages/base_en.properties b/src/main/resources/languages/base_en.properties
index 84dbe5cb7e4837f9798b73435717c787cc4f03af..7283f21adf0177cda857f3bacef207cce4f15be3 100644
--- a/src/main/resources/languages/base_en.properties
+++ b/src/main/resources/languages/base_en.properties
@@ -146,7 +146,7 @@ warning.duplicate.template.name=A template with this name is already existing.
 warning.transaction.date=The specified date does not correspond to the allowed format. Expected format: DD.MM.YY, DDMMYY, DD.MM.YYYY, DDMMYYYY.
 warning.empty.git.url=Please insert the git server's URL.
 warning.empty.git.user.name=Please insert your git user name.
-warning.empty.git.password=Please insert your git password.
+warning.empty.git.token=Please insert your git access token.
 
 
 # UI
@@ -210,7 +210,7 @@ settings.backup.auto.files.to.keep=Number of backups to keep (0 for unlimited)
 settings.backup.auto.next=Next execution
 settings.backup.auto.git.url=Git server address
 settings.backup.auto.git.user.name=Git user name
-settings.backup.auto.git.password=Git password
+settings.backup.auto.git.token=Git access token
 settings.backup.auto.git.test=Test connection
 settings.backup.auto.git.test.success=Connection successful!
 settings.backup.auto.git.test.fail=Connection failed!
diff --git a/src/main/resources/static/js/settings.js b/src/main/resources/static/js/settings.js
index 0161aea79a20f2419d498ee946aeb62452cbcd16..bd2e26572d7b39498a9cbd9ee570d18e9df5d065 100644
--- a/src/main/resources/static/js/settings.js
+++ b/src/main/resources/static/js/settings.js
@@ -31,7 +31,7 @@ $(document).ready(function()
                 '_csrf': document.getElementById('token').value,
                 'autoBackupGitUrl': document.getElementById('settings-backup-auto-git-url').value,
                 'autoBackupGitUserName': document.getElementById('settings-backup-auto-git-user-name').value,
-                'autoBackupGitPassword': document.getElementById('settings-backup-auto-git-password').value,
+                'autoBackupGitToken': document.getElementById('settings-backup-auto-git-token').value,
             },
             success: function(data)
             {
diff --git a/src/main/resources/templates/settings/settingsMacros.ftl b/src/main/resources/templates/settings/settingsMacros.ftl
index 81f0de13d0b137b9fa5176094a0b60d7aba8e1fd..919afda2789c1a6b45e7f293723c168f20bb8fd2 100644
--- a/src/main/resources/templates/settings/settingsMacros.ftl
+++ b/src/main/resources/templates/settings/settingsMacros.ftl
@@ -236,8 +236,8 @@
 
         <div class="input-field col s12 m12 l8 offset-l2">
             <i class="material-icons prefix">vpn_key</i>
-            <input id="settings-backup-auto-git-password" name="autoBackupGitPassword" type="text" <@validation.validation "autoBackupGitPassword"/> value="•••••">
-            <label for="settings-backup-auto-git-password">${locale.getString("settings.backup.auto.git.password")}</label>
+            <input id="settings-backup-auto-git-token" name="autoBackupGitToken" type="text" <@validation.validation "autoBackupGitToken"/> value="•••••">
+            <label for="settings-backup-auto-git-token">${locale.getString("settings.backup.auto.git.token")}</label>
         </div>
 
         <div class="col s12 m12 l8 offset-l2">