diff --git a/src/dsql/DdlNodes.epp b/src/dsql/DdlNodes.epp
index 0c2a26992f..688d54ab0c 100644
--- a/src/dsql/DdlNodes.epp
+++ b/src/dsql/DdlNodes.epp
@@ -10870,6 +10870,7 @@ void MappingNode::runInSecurityDb(SecDbContext* secDbContext)
 			ddl += ' ';
 			if (from)
 			{
+				ddl += "_utf8 ";
 				addItem(ddl, fromUtf8.c_str(), '\'');
 				ddl += ' ';
 			}
diff --git a/src/dsql/parse.y b/src/dsql/parse.y
index 74501908c8..2eac7d7031 100644
--- a/src/dsql/parse.y
+++ b/src/dsql/parse.y
@@ -7804,7 +7804,7 @@ map_from_symbol_name
 %type <intlStringPtr> map_logoninfo
 map_logoninfo
 	: sql_string
-	| valid_symbol_name		{ $$ = newNode<IntlString>($1->c_str()); }
+	| valid_symbol_name		{ $$ = newIntlString($1->c_str(), metadataCharSet->getName()); }
 	;
 
 %type map_using(<mappingNode>)
diff --git a/src/isql/show.epp b/src/isql/show.epp
index d093e45295..8c73486c9e 100644
--- a/src/isql/show.epp
+++ b/src/isql/show.epp
@@ -5091,7 +5091,7 @@ static void printMap(bool extract, bool global, char* name, char* usng, char* pl
 	isqlGlob.printf("FROM %s", anyObj ? "ANY " : "");
 	printIdent(extract, fromType, "%s ");
 	if (!anyObj)
-		printIdent(extract, from, "%s ");
+		isqlGlob.printf("\'%s\' ", from);
 
 	isqlGlob.printf("TO %s ", toType ? "ROLE" : "USER");
 	if (to)