diff --git a/cmd_parser.c b/cmd_parser.c
index 3794f2e..8c0e099 100644
--- a/cmd_parser.c
+++ b/cmd_parser.c
@@ -627,18 +627,19 @@ void cmd_parser(void) __banked
 			print_string("\nRESET\n\n");
 			reset_chip();
 		} else if (cmd_compare(0, "sfp")) {
-			uint8_t rate = sfp_read_reg(0, 12);
-			print_string("\nRate: "); print_byte(rate);
+			print_string("\nSlot 0 - Rate: "); print_byte(sfp_read_reg(0, 12));
 			print_string("  Encoding: "); print_byte(sfp_read_reg(0, 11));
 			print_string("\n");
-			for (uint8_t i = 20; i < 60; i++) {
-				uint8_t c = sfp_read_reg(0, i);
-				if (c)
-					write_char(c);
-			}
+			sfp_print_info(0);
+#if NSFP == 2
+			print_string("\nSlot 1 - Rate: "); print_byte(sfp_read_reg(1, 12));
+			print_string("  Encoding: "); print_byte(sfp_read_reg(1, 11));
+			print_string("\n");
+			sfp_print_info(1);
+#endif
 		} else if (cmd_compare(0, "stat")) {
 			port_stats_print();
-		} else 	if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && cmd_buffer[cmd_words_b[1]] == 'r') {
+		} else if (cmd_compare(0, "flash") && cmd_words_b[1] > 0 && cmd_buffer[cmd_words_b[1]] == 'r') {
 			print_string("\nPRINT SECURITY REGISTERS\n");
 			// The following will only show something else than 0xff if it was programmed for a managed switch
 			flash_region.addr = 0x0001000;
diff --git a/rtl837x_common.h b/rtl837x_common.h
index 06e4a23..5377eb2 100644
--- a/rtl837x_common.h
+++ b/rtl837x_common.h
@@ -106,5 +106,6 @@ void print_string_x(__xdata char *p);
 uint8_t read_flash(uint8_t bank, __code uint8_t *addr);
 void get_random_32(void);
 void read_reg_timer(uint32_t * tmr);
+void sfp_print_info(uint8_t sfp);
 
 #endif
diff --git a/rtlplayground.c b/rtlplayground.c
index 073ca78..b3c9410 100644
--- a/rtlplayground.c
+++ b/rtlplayground.c
@@ -906,7 +906,10 @@ static inline uint8_t sfp_rate_to_sds_config(register uint8_t rate)
 
 void sfp_print_info(uint8_t sfp)
 {
+	// This loops over the Vendor-name, Vendor OUI, Vendor PN and Vendor rev ASCII fields
 	for (uint8_t i = 20; i < 60; i++) {
+		if (i >= 36 && i < 40) // Skip Non-ASCII codes
+			continue;
 		uint8_t c = sfp_read_reg(sfp, i);
 		if (c)
 			write_char(c);