Fix flash message

1 fix + 1 improvement in here. (separated by commits)

review @andrew @despo