Fix account input bugs
Merge pull request #17 from yamanetoshi/Issue#16

Fix account input bugs