ARMS-58 #Done Add 'No licence' option as requested