Index: channels/sig_pri.c
===================================================================
--- channels/sig_pri.c	(revision 311466)
+++ channels/sig_pri.c	(working copy)
@@ -737,7 +737,7 @@
 				ast_subaddress->str, sizeof(pri_subaddress->data));
 
 			pri_subaddress->length = length;
-			pri_subaddress->odd_even_indicator = (length & 1);
+			pri_subaddress->odd_even_indicator = (strlen(ast_subaddress->str) & 1);
 			pri_subaddress->valid = 1;
 		}
 	}
@@ -7102,12 +7102,10 @@
 		s++;
 		/* prefix */
 		/* 'n' = NSAP */
-		/* 'U' = odd, 'u'= even */
+		/* 'u' = USER */
 		/* Default = NSAP */
 		switch (*s) {
 		case 'U':
-			dialed_subaddress.odd_even_indicator = 1;
-			/* fall through */
 		case 'u':
 			s++;
 			dialed_subaddress.type = 2;