BOOK-693, default amount fixes
Merge pull request #892 from onepercentclub/feature/BOOK-693

BOOK-693, default amount fixes