Feature/395 update username

Initial merge of functionality