diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
index 0779259de2e054d37e0d09e9989cbd7e4768888e..2b280ca9f10a0754d2ace3413f5d2f5067c98151 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateController.java
@@ -139,13 +139,13 @@ public class TemplateController extends BaseController
 
 		if(newTransaction.getAmount() == null && newTransaction.isExpenditure() == null)
 		{
-			template.setIsExpenditure(true);
+			newTransaction.setIsExpenditure(true);
 		}
 
 		final DateTime date = dateService.getDateTimeFromCookie(cookieDate);
-		transactionService.prepareModelNewOrEdit(model, false, date, null, template, accountService.getAllActivatedAccountsAsc());
+		transactionService.prepareModelNewOrEdit(model, false, date, null, newTransaction, accountService.getAllActivatedAccountsAsc());
 
-		if(template.isTransfer())
+		if(newTransaction.isTransfer())
 		{
 			return "transactions/newTransactionTransfer";
 		}
diff --git a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
index b49351020e0be40ef2e3fb00a6e3c979c652cec5..f03ee377c2ec4617730a8df5a273983ebc946355 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/templates/TemplateService.java
@@ -91,6 +91,12 @@ public class TemplateService implements Resettable, AccessAllEntities<Template>
 		{
 			template.setAccount(accountService.getRepository().findByIsDefault(true));
 		}
+
+		final Account transferAccount = template.getTransferAccount();
+		if(transferAccount != null && transferAccount.getAccountState() != AccountState.FULL_ACCESS)
+		{
+			template.setTransferAccount(accountService.getRepository().findByIsDefault(true));
+		}
 	}
 
 	public void prepareModelNewOrEdit(Model model, boolean isEdit, TransactionBase item, List<Account> accounts)