BlackBerry setup improvement