diff --git a/Source/pages/repo_manage_page.php b/Source/pages/repo_manage_page.php
index 383acab..1d425b4 100644
--- a/Source/pages/repo_manage_page.php
+++ b/Source/pages/repo_manage_page.php
@@ -128,14 +128,14 @@
 <td><?php echo plugin_lang_get( 'delete' ) ?></td>
 </tr>
 
-<?php foreach( $t_mappings as $t_mapping ) { ?>
+<?php foreach( $t_mappings as $t_mapping ) { $t_branch = str_replace( '.', '_', $t_mapping->branch ); ?>
 
 <tr <?php echo helper_alternate_class() ?>>
-<td><input name="<?php echo $t_mapping->branch ?>_branch" value="<?php echo string_attribute( $t_mapping->branch ) ?>" size="12" maxlength="128"/></td>
-<td><select name="<?php echo $t_mapping->branch ?>_type"><?php display_strategies( $t_mapping->type ) ?></select></td>
-<td><select name="<?php echo $t_mapping->branch ?>_version"><?php print_version_option_list( $t_mapping->version, ALL_PROJECTS, false, true, true ) ?></select></td>
-<td><input name="<?php echo $t_mapping->branch ?>_regex" value="<?php echo string_attribute( $t_mapping->regex ) ?>" size="18" maxlength="128"/></td>
-<td><input name="<?php echo $t_mapping->branch ?>_delete" type="checkbox" value="1"/></td>
+<td><input name="<?php echo $t_branch ?>_branch" value="<?php echo string_attribute( $t_mapping->branch ) ?>" size="12" maxlength="128"/></td>
+<td><select name="<?php echo $t_branch ?>_type"><?php display_strategies( $t_mapping->type ) ?></select></td>
+<td><select name="<?php echo $t_branch ?>_version"><?php print_version_option_list( $t_mapping->version, ALL_PROJECTS, false, true, true ) ?></select></td>
+<td><input name="<?php echo $t_branch ?>_regex" value="<?php echo string_attribute( $t_mapping->regex ) ?>" size="18" maxlength="128"/></td>
+<td><input name="<?php echo $t_branch ?>_delete" type="checkbox" value="1"/></td>
 </tr>
 <?php } ?>
 
diff --git a/Source/pages/repo_update_mappings.php b/Source/pages/repo_update_mappings.php
index 2e45351..c3f6686 100644
--- a/Source/pages/repo_update_mappings.php
+++ b/Source/pages/repo_update_mappings.php
@@ -30,10 +30,12 @@
 		$t_mapping->delete();
 	}
 
-	$f_mapping_branch = gpc_get_string( $t_mapping->branch . '_branch', $t_mapping->branch );
-	$f_mapping_type = gpc_get_int( $t_mapping->branch . '_type', $t_mapping->type );
-	$f_mapping_version = gpc_get_string( $t_mapping->branch . '_version', $t_mapping->version );
-	$f_mapping_regex = gpc_get_string( $t_mapping->branch . '_regex', $t_mapping->regex );
+	$t_posted_branch = str_replace( '.', '_', $t_mapping->branch );
+
+	$f_mapping_branch = gpc_get_string( $t_posted_branch . '_branch', $t_mapping->branch );
+	$f_mapping_type = gpc_get_int( $t_posted_branch . '_type', $t_mapping->type );
+	$f_mapping_version = gpc_get_string( $t_posted_branch . '_version', $t_mapping->version );
+	$f_mapping_regex = gpc_get_string( $t_posted_branch . '_regex', $t_mapping->regex );
 
 	$t_update = false;