diff --git a/application/controllers/giftcards.php b/application/controllers/giftcards.php
index 3b052bddd..017101d2b 100644
--- a/application/controllers/giftcards.php
+++ b/application/controllers/giftcards.php
@@ -56,10 +56,11 @@ class Giftcards extends Secure_area implements iData_controller
 
 	function view($giftcard_id=-1)
 	{
-		$giftcard_info=$this->Giftcard->get_info($giftcard_id);
-		$person_name=$giftcard_info->first_name . ' ' . $giftcard_info->last_name;
+		$giftcard_info = $this->Giftcard->get_info($giftcard_id);
+		$person_name=$giftcard_id > 0? $giftcard_info->first_name . ' ' . $giftcard_info->last_name : '';
 		$data['selected_person'] = $giftcard_id > 0 ? $giftcard_info->person_id . "|" . $person_name : "";
-		$data['giftcard_info']=$giftcard_info;
+		$data['giftcard_number']= $giftcard_id > 0 ? $giftcard_info->giftcard_id : $this->Giftcard->get_max_number()->giftcard_number + 1;
+		$data['giftcard_info'] = $giftcard_info;
 		$this->load->view("giftcards/form",$data);
 	}
 	
diff --git a/application/models/giftcard.php b/application/models/giftcard.php
index 3cd1520ca..c4bf3c450 100644
--- a/application/models/giftcard.php
+++ b/application/models/giftcard.php
@@ -13,6 +13,13 @@ class Giftcard extends CI_Model
 
 		return ($query->num_rows()==1);
 	}
+	
+	function get_max_number ( )
+	{
+		$this->db->select_max('giftcard_number');
+		$query = $this->db->get('giftcards');
+		return $query->row();
+	}
 
 	/*
 	Returns all the giftcards
diff --git a/application/views/giftcards/form.php b/application/views/giftcards/form.php
index b15900e87..887a2ae28 100644
--- a/application/views/giftcards/form.php
+++ b/application/views/giftcards/form.php
@@ -25,7 +25,7 @@ echo form_open('giftcards/save/'.$giftcard_info->giftcard_id,array('id'=>'giftca
 	<?php echo form_input(array(
 		'name'=>'giftcard_number',
 		'id'=>'giftcard_number',
-		'value'=>$giftcard_info->giftcard_number)
+		'value'=>$giftcard_number)
 	);?>
 	</div>
 </div>