diff --git a/db/migrate/000121_admin_testphone.sql b/db/migrate/000121_admin_testphone.sql
new file mode 100644
index 000000000..2768ee4b3
--- /dev/null
+++ b/db/migrate/000121_admin_testphone.sql
@@ -0,0 +1 @@
+ALTER TABLE `admin` ADD `testphone` VARCHAR( 12 )  NULL DEFAULT NULL;
\ No newline at end of file
diff --git a/include/views/default/cockpit/giftcards/email.phtml b/include/views/default/cockpit/giftcards/email.phtml
index eb4b17b38..676049bb1 100644
--- a/include/views/default/cockpit/giftcards/email.phtml
+++ b/include/views/default/cockpit/giftcards/email.phtml
@@ -133,7 +133,8 @@
 											<tr class="track-fields">
 												<td class="label-sub">Notify phone:</td>
 												<td class="content-sub">
-													<input type="text" id="notify_phone" value="<?=c::admin()->phone?>" name="notify_phone">
+
+													<input type="text" id="notify_phone" value="<?=c::admin()->testphone?>" name="notify_phone">
 													<br />
 													<span style="font-size:11px;">
 														*Phone number that will receive a sms <br/>notification when this gift card is redeemed.
diff --git a/include/views/default/cockpit/giftcards/new.phtml b/include/views/default/cockpit/giftcards/new.phtml
index 7941e421e..9dbfb2a03 100644
--- a/include/views/default/cockpit/giftcards/new.phtml
+++ b/include/views/default/cockpit/giftcards/new.phtml
@@ -136,10 +136,7 @@
 						<li class="track-fields">
 							<span>Notify phone</span>
 							<span class="pull-right">
-								<?php if ($_SESSION['admin'] && c::config()->testphone->{ $_SESSION[ 'username' ] } ) {
-									$phone = c::config()->testphone->{ $_SESSION[ 'username' ] };
-								} ?>
-								<input type="text" id="notify_phone" value="<?php echo $phone; ?>" name="notify_phone">
+								<input type="text" id="notify_phone" value="<?=c::admin()->testphone?>" name="notify_phone">
 							</span>
 							<hr/>
 							<div class="note large">
diff --git a/include/views/default/cockpit/giftcards/sms.phtml b/include/views/default/cockpit/giftcards/sms.phtml
index 8e8d2aed5..9dd805d52 100644
--- a/include/views/default/cockpit/giftcards/sms.phtml
+++ b/include/views/default/cockpit/giftcards/sms.phtml
@@ -99,12 +99,7 @@
 											<tr class="track-fields">
 												<td class="label-sub">Notify phone:</td>
 												<td class="content-sub">
-													<?php
-													if ($_SESSION['admin'] && c::config()->testphone->{ $_SESSION[ 'username' ] } ) {
-														$phone = c::config()->testphone->{ $_SESSION[ 'username' ] };
-													}
-													?>
-													<input type="text" id="notify_phone" value="<?php echo $phone; ?>" name="notify_phone">
+													<input type="text" id="notify_phone" value="<?=c::admin()->testphone?>" name="notify_phone">
 													<br />
 													<span style="font-size:11px;">
 														*Phone number that will receive a sms <br/>notification when this gift card is redeemed.