diff --git a/app/components/add-expense-item/component.js b/app/components/add-expense-item/component.js
index 6ac06d4..30d4824 100644
--- a/app/components/add-expense-item/component.js
+++ b/app/components/add-expense-item/component.js
@@ -4,7 +4,6 @@ import { action } from '@ember/object';
 import moment from 'moment';
 
 export default class AddExpenseItemComponent extends Component {
-
   // @tracked newExpense = Expense.create();
   @tracked amount = '0';
   @tracked currency = 'EUR';
@@ -31,9 +30,6 @@ export default class AddExpenseItemComponent extends Component {
     return !this.submitButtonEnabled;
   }
 
-  setDefaultValues () {
-  }
-
   @action
   submit (e) {
     e.preventDefault();
@@ -54,6 +50,5 @@ export default class AddExpenseItemComponent extends Component {
     }
 
     this.args.addExpenseItem(expense);
-    this.resetProperties();
   }
 }
diff --git a/app/components/add-reimbursement/component.js b/app/components/add-reimbursement/component.js
index d9c76d1..a30e87f 100644
--- a/app/components/add-reimbursement/component.js
+++ b/app/components/add-reimbursement/component.js
@@ -4,6 +4,7 @@ import { alias } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 import { action } from '@ember/object';
 import { A } from '@ember/array';
+import { scheduleOnce } from '@ember/runloop';
 import Reimbursement from 'kredits-web/models/reimbursement';
 
 export default class AddReimbursementComponent extends Component {
@@ -25,9 +26,15 @@ export default class AddReimbursementComponent extends Component {
     return !this.submitButtonEnabled;
   }
 
+  scrollToExpenseItemForm () {
+    const anchor = document.getElementById('new-expense-item');
+    anchor.scrollIntoView();
+  }
+
   @action
   showExpenseForm () {
     this.expenseFormVisible = true;
+    scheduleOnce('afterRender', this, this.scrollToExpenseItemForm);
   }
 
   @action
@@ -48,7 +55,6 @@ export default class AddReimbursementComponent extends Component {
   @action
   submit (e) {
     e.preventDefault();
-    console.log('submit', e);
     // TODO
     // amount = parseFloat(this.total)
     // token = "WBTC" (or token address)
diff --git a/app/components/add-reimbursement/template.hbs b/app/components/add-reimbursement/template.hbs
index 9af5164..7523299 100644
--- a/app/components/add-reimbursement/template.hbs
+++ b/app/components/add-reimbursement/template.hbs
@@ -51,7 +51,7 @@
   </p>
 
   {{#if this.expenseFormVisible}}
-    <h3>New expense item</h3>
+    <h3 id="new-expense-item">New expense item</h3>
     <AddExpenseItem @addExpenseItem={{fn this.addExpenseItem}} />
   {{/if}}
 </form>