diff --git a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java b/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
index 98e7f0e49e916c8c3917ed9b47b22e653a55f24c..93def3e53ff92006958e9dc2e03de12b527b8e2c 100644
--- a/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
+++ b/src/main/java/de/deadlocker8/budgetmaster/categories/CategoryController.java
@@ -90,7 +90,7 @@ public class CategoryController extends BaseController
 	public String editCategory(Model model, @PathVariable("ID") Integer ID)
 	{
 		Optional<Category> categoryOptional = categoryService.findById(ID);
-		if(!categoryOptional.isPresent())
+		if(categoryOptional.isEmpty())
 		{
 			throw new ResourceNotFoundException();
 		}
diff --git a/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java b/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java
index fdf17be49815082b5b487fab5ceddf0b6df264aa..e4e88544458ba806e7674c1b1b15512016d6625e 100644
--- a/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java
+++ b/src/test/java/de/deadlocker8/budgetmaster/integration/helpers/IntegrationTestHelper.java
@@ -144,7 +144,7 @@ public class IntegrationTestHelper
 		wait.until(ExpectedConditions.visibilityOfElementLocated(By.id("account-name")));
 		WebElement inputAccountName = driver.findElement(By.id("account-name"));
 		inputAccountName.sendKeys(accountName);
-		driver.findElement(By.tagName("button")).click();
+		driver.findElement(By.id("button-save-account")).click();
 	}
 
 	private void matchAccounts(List<String> sourceAccounts, List<String> destinationAccounts)