diff --git a/lib/Travelynx/Helper/Traewelling.pm b/lib/Travelynx/Helper/Traewelling.pm
index 36af239b79dae399d3dfb857508419d5935e927c..c6b3dd01caa1872f91cd6228086647aebe25856d 100644
--- a/lib/Travelynx/Helper/Traewelling.pm
+++ b/lib/Travelynx/Helper/Traewelling.pm
@@ -285,6 +285,10 @@ sub checkin {
 		$opt{dep_eva}
 	);
 
+	if ( $opt{user_data}{comment} ) {
+		$request->{body} = $opt{user_data}{comment};
+	}
+
 	# Work around https://github.com/Traewelling/traewelling/issues/72
 	$self->{user_agent}->request_timeout(20)
 	  ->get_p(
diff --git a/lib/Travelynx/Model/Traewelling.pm b/lib/Travelynx/Model/Traewelling.pm
index 181c5195da558dd0c9be906cb2516100e8e61fc7..1a2f4ec039185f48c9276f0579c23a67b133c022 100644
--- a/lib/Travelynx/Model/Traewelling.pm
+++ b/lib/Travelynx/Model/Traewelling.pm
@@ -185,6 +185,7 @@ sub get_pushable_accounts {
 	my ($self) = @_;
 	my $res = $self->{pg}->db->query(
 		qq{select t.user_id as uid, t.token as token, t.data as data,
+			i.user_data as user_data,
 			i.checkin_station_id as dep_eva, i.checkout_station_id as arr_eva,
 			i.data as journey_data, i.train_type as train_type,
 			i.train_line as train_line, i.train_no as train_no,