Fixed #1809

Thanks to @Tokeiburu

src/map/atcommand.c

@@ -5815,7 +5815,7 @@ ACMD_FUNC(marry)
 
 	nullpo_retr(-1, sd);
 
-	if (!message || !*message || sscanf(message, "%23s", player_name) != 1) {
+	if (!message || !*message || sscanf(message, "%23[^\n]", player_name) != 1) {
 		clif_displaymessage(fd, msg_txt(sd,1172)); // Usage: @marry <char name>
 		return -1;
 	}
@@ -5828,6 +5828,8 @@ ACMD_FUNC(marry)
 	if (pc_marriage(sd, pl_sd)) {
 		clif_displaymessage(fd, msg_txt(sd,1173)); // They are married... wish them well.
 		clif_wedding_effect(&pl_sd->bl); //wedding effect and music [Lupus]
+		if( pl_sd->bl.m != sd->bl.m )
+			clif_wedding_effect(&sd->bl);
 		getring(sd); // Auto-give named rings (Aru)
 		getring(pl_sd);
 		return 0;