CF #17 and #18 - Start handling account validation